Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe150e2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add a ramdisk stub for targets that referred to goldfish's arm32.mk" am: 74d79e32 

Original change: https://android-review.googlesource.com/c/platform/build/+/2295643



Change-Id: I9616bf9c6a98128a4ebc8ff8a90cd8a34f5178ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7c2dde5 74d79e32

target/product/aosp_arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/full.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)

target/product/ramdisk_stub.mk

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# 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

target/product/sdk_phone_armv7.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)