StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move emulator.mk out of full_base.mk

Browse Source 
Instead we should have the emulator products (full, full_mips, full_x86,
sdk) inherit from emulator.mk directly, because full_base.mk is also
inherited by real device products, such as full_manta.mk.

Change-Id: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
This commit is contained in:
Ying Wang
2013-03-04 22:53:37 -08:00
parent d4c6ff727d
commit 83c23e69d8
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/full.mk
View File

@@ -22,6 +22,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
# Overrides # Overrides
PRODUCT_NAME := full PRODUCT_NAME := full
PRODUCT_DEVICE := generic PRODUCT_DEVICE := generic

2
target/product/full_base.mk
View File

@@ -40,8 +40,6 @@ PRODUCT_PACKAGES += \
VisualizationWallpapers \ VisualizationWallpapers \
PhotoTable PhotoTable
include $(SRC_TARGET_DIR)/product/emulator.mk
# Additional settings used in all AOSP builds # Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_PROPERTY_OVERRIDES := \
ro.com.android.dateformat=MM-dd-yyyy \ ro.com.android.dateformat=MM-dd-yyyy \

2
target/product/full_mips.mk
View File

@@ -22,6 +22,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
# Overrides # Overrides
PRODUCT_NAME := full_mips PRODUCT_NAME := full_mips
PRODUCT_DEVICE := generic_mips PRODUCT_DEVICE := generic_mips

2
target/product/full_x86.mk
View File

@@ -26,6 +26,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
ifdef NET_ETH0_STARTONBOOT ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif endif