Merge "Move emulator.mk out of full_base.mk" into jb-mr2-dev

2013-03-05 07:09:37 +00:00
parent d5198cbcce e8f5406582
commit eabb34fb90
4 changed files with 6 additions and 2 deletions
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -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
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -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 \
--- a/target/product/full_mips.mk
+++ b/target/product/full_mips.mk
@@ -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
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -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