openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Move emulator.mk out of full_base.mk 

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: I475f7262eaa65dd85fc844ed357547c76c82598f
This commit is contained in:
Ying Wang 2013-03-04 22:53:37 -08:00
parent 3e3a3a2b79
commit e8f5406582
4 changed files with 6 additions and 2 deletions
Show Stats 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)/board/generic/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
# Overrides
PRODUCT_NAME := full
PRODUCT_DEVICE := generic

2
target/product/full_base.mk
View File

@ -40,8 +40,6 @@ PRODUCT_PACKAGES += \
VisualizationWallpapers \
PhotoTable
include $(SRC_TARGET_DIR)/product/emulator.mk
# Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES := \
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)/board/generic_mips/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
# Overrides
PRODUCT_NAME := full_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)/board/generic_x86/device.mk)
include $(SRC_TARGET_DIR)/product/emulator.mk
ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif