diff options
| author | Ying Wang <wangying@google.com> | 2013-03-04 22:53:37 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2013-03-04 23:08:01 -0800 |
| commit | e8f5406582f533d08b8a7aef77d800e8eb2819b3 (patch) | |
| tree | b8b8d45ecd1275831e5d3e697a00ab397676f9a8 | |
| parent | 3e3a3a2b794531c517064cc115f8f5e00da07b4a (diff) | |
| download | build-e8f5406582f533d08b8a7aef77d800e8eb2819b3.zip build-e8f5406582f533d08b8a7aef77d800e8eb2819b3.tar.gz build-e8f5406582f533d08b8a7aef77d800e8eb2819b3.tar.bz2 | |
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
| -rw-r--r-- | target/product/full.mk | 2 | ||||
| -rw-r--r-- | target/product/full_base.mk | 2 | ||||
| -rw-r--r-- | target/product/full_mips.mk | 2 | ||||
| -rw-r--r-- | target/product/full_x86.mk | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/target/product/full.mk b/target/product/full.mk index 8231e99..a4075d4 100644 --- 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 diff --git a/target/product/full_base.mk b/target/product/full_base.mk index c28fd1b..b2e3189 100644 --- 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 \ diff --git a/target/product/full_mips.mk b/target/product/full_mips.mk index 2debfec..9418ba2 100644 --- 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 diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk index 9941384..6e229a5 100644 --- 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 |