Merge "Remove references to device/generic/goldfish/arm32-vendor.mk"
This commit is contained in:
@@ -49,7 +49,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
|||||||
#
|
#
|
||||||
# All components inherited here go to vendor image
|
# 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)/product/emulator_vendor.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
|
||||||
|
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
# build quite specifically for the emulator, and might not be
|
# build quite specifically for the emulator, and might not be
|
||||||
# entirely appropriate to inherit from for on-device configurations.
|
# 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/emulator_vendor.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
|
||||||
|
@@ -45,7 +45,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
|||||||
#
|
#
|
||||||
# All components inherited here go to vendor image
|
# 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)/product/emulator_vendor.mk)
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/board/emulator_arm/device.mk)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user