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

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

Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am:... 

Merge "Remove references to device/generic/goldfish/arm32-vendor.mk" am: 2a273f50 am: 845fd94a am: f33dd70b

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



Change-Id: I0f08e2e11b56f07c85191c4a9024d6493552519f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6de7fbb f33dd70b

target/product/aosp_arm.mk

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

target/product/full.mk

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

target/product/sdk_phone_armv7.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/arm32-vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)