Remove emulator dependencies on non emulator targets (1)
Bug: 266607613 Bug: 111538404 Test: presubmit Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd Signed-off-by: Roman Kiryanov <rkir@google.com>
This commit is contained in:
@@ -51,7 +51,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
|
||||
|
||||
|
@@ -46,7 +46,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/riscv64-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_riscv64/device.mk)
|
||||
|
||||
|
@@ -47,7 +47,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
|
||||
|
||||
|
@@ -56,7 +56,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/x86_64-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk)
|
||||
|
@@ -45,7 +45,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
#
|
||||
# All components inherited here go to vendor image
|
||||
#
|
||||
$(call inherit-product-if-exists, device/generic/goldfish/x86-vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_arm/device.mk)
|
||||
|
||||
|
Reference in New Issue
Block a user