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

Commit 52b797e7 authored Mar 29, 2023 by Roman Kiryanov

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>

parent c3610a1a

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)