Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am: 2a273f50d4

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

Change-Id: Ib7accf4c713acf57c9ea193c0539d6cb28e3edef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-11-09 20:52:27 +00:00
committed by Automerger Merge Worker
3 changed files with 0 additions and 3 deletions

View File

@@ -49,7 +49,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)

View File

@@ -19,7 +19,6 @@
# build quite specifically for the emulator, and might not be # build quite specifically for the emulator, and might not be
# entirely appropriate to inherit from for on-device configurations. # entirely appropriate to inherit from for on-device configurations.
$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.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)/product/aosp_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)

View File

@@ -45,7 +45,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# #
# All components inherited here go to vendor image # All components inherited here go to vendor image
# #
$(call inherit-product-if-exists, device/generic/goldfish/arm32-vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)