From 83c23e69d8e225b47adf7dbcb30803f8e2e3a632 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 4 Mar 2013 22:53:37 -0800
Subject: [PATCH] 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: I6f5f9255c73be8a4cfad7ddf88c4b633b05a7091
---
 target/product/full.mk      | 2 ++
 target/product/full_base.mk | 2 --
 target/product/full_mips.mk | 2 ++
 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 8231e994d9..a4075d46df 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 c28fd1bc39..b2e3189f5a 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 2debfece11..9418ba260b 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 99413842d6..6e229a5c71 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