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

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

Merge "Remove emulator dependencies on non emulator targets (1)" am: 2782b82d am: 825ec3ea 

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



Change-Id: I0e856b35ccaa0f175e3990ca28309fe97947b8a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f9a0488 825ec3ea

target/product/aosp_64bitonly_x86_64.mk

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

target/product/aosp_riscv64.mk

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

target/product/aosp_x86.mk

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

target/product/aosp_x86_64.mk

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

target/product/aosp_x86_arm.mk

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