From 52b797e74110c983faadce7daf77ccf21faac048 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 29 Mar 2023 11:47:10 -0700 Subject: [PATCH] Remove emulator dependencies on non emulator targets (1) Bug: 266607613 Bug: 111538404 Test: presubmit Change-Id: I2c8870d68696f39277a503081c91274b0e9ec1bd Signed-off-by: Roman Kiryanov --- target/product/aosp_64bitonly_x86_64.mk | 1 - target/product/aosp_riscv64.mk | 1 - target/product/aosp_x86.mk | 1 - target/product/aosp_x86_64.mk | 1 - target/product/aosp_x86_arm.mk | 1 - 5 files changed, 5 deletions(-) diff --git a/target/product/aosp_64bitonly_x86_64.mk b/target/product/aosp_64bitonly_x86_64.mk index 4de4e0c897..b8ca3aa634 100644 --- a/target/product/aosp_64bitonly_x86_64.mk +++ b/target/product/aosp_64bitonly_x86_64.mk @@ -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) diff --git a/target/product/aosp_riscv64.mk b/target/product/aosp_riscv64.mk index bc35b95129..0e5d9fec07 100644 --- a/target/product/aosp_riscv64.mk +++ b/target/product/aosp_riscv64.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) diff --git a/target/product/aosp_x86.mk b/target/product/aosp_x86.mk index 7db2c0ff0c..669874e3ad 100644 --- a/target/product/aosp_x86.mk +++ b/target/product/aosp_x86.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) diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index d55866f4ec..deaa3b1df3 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.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) diff --git a/target/product/aosp_x86_arm.mk b/target/product/aosp_x86_arm.mk index f96e068b56..39ad0d8d76 100644 --- a/target/product/aosp_x86_arm.mk +++ b/target/product/aosp_x86_arm.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)