From ada0ed43c0d64d19e9817d58cf732e4ed43018a6 Mon Sep 17 00:00:00 2001 From: Roman Kiryanov Date: Wed, 26 Oct 2022 17:09:47 -0700 Subject: [PATCH] Remove references to device/generic/goldfish/arm32-vendor.mk this file is not maintained and being retired. Bug: 250696437 Test: presubmit Signed-off-by: Roman Kiryanov Change-Id: I6f84ae055014e16ef8af92d77c8db95f714e4182 --- target/product/aosp_arm.mk | 1 - target/product/full.mk | 1 - target/product/sdk_phone_armv7.mk | 1 - 3 files changed, 3 deletions(-) diff --git a/target/product/aosp_arm.mk b/target/product/aosp_arm.mk index 90acc17fee..9f67e1cafd 100644 --- a/target/product/aosp_arm.mk +++ b/target/product/aosp_arm.mk @@ -49,7 +49,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/arm32-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/full.mk b/target/product/full.mk index 782280d1db..2757d9a5c0 100644 --- a/target/product/full.mk +++ b/target/product/full.mk @@ -19,7 +19,6 @@ # build quite specifically for the emulator, and might not be # 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/aosp_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index 6c88b44fd0..f81bec2ad1 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.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/arm32-vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)