From d9682377fe9097e97b88aa9b67e6b1cce7226771 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 9 Nov 2022 12:24:16 -0800 Subject: [PATCH] Add a ramdisk stub for targets that referred to goldfish's arm32.mk there is a check that requires the ramdisk to be nonempty. Bug: 250696437 Test: presubmit Change-Id: If3918ec1eb0e6263ed845e48c7415755c0cfc832 Signed-off-by: Roman Kiryanov --- target/product/aosp_arm.mk | 1 + target/product/full.mk | 1 + target/product/ramdisk_stub.mk | 18 ++++++++++++++++++ target/product/sdk_phone_armv7.mk | 1 + 4 files changed, 21 insertions(+) create mode 100644 target/product/ramdisk_stub.mk diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 9f67e1cafd..5f200aafb6 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -49,6 +49,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # All components inherited here go to vendor image # +$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) diff --git a/target/product/full.mk b/target/product/full.mk index 2757d9a5c0..945957ff81 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,6 +19,7 @@ # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) diff --git a/target/product/ramdisk_stub.mk b/target/product/ramdisk_stub.mk new file mode 100644 index 0000000000..2a0b752e61 --- /dev/null +++ b/target/product/ramdisk_stub.mk @@ -0,0 +1,18 @@ +# +# Copyright 2022 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +PRODUCT_COPY_FILES += \ + build/make/target/product/ramdisk_stub.mk:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/nonempty diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index f81bec2ad1..888505b665 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -45,6 +45,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # All components inherited here go to vendor image # +$(call inherit-product-if-exists, build/make/target/product/ramdisk_stub.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)