From 229b13756417fb301e41a5b82eef755e4eb2b697 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jessehall@google.com>
Date: Wed, 28 Nov 2012 09:53:20 -0800
Subject: [PATCH] Add emulator modules to PRODUCT_PACKAGES in full and sdk
 products

Bug: 7556265
Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
---
 target/product/emulator.mk  | 36 ++++++++++++++++++++++++++++++++++++
 target/product/full_base.mk |  2 ++
 target/product/sdk.mk       |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 target/product/emulator.mk

diff --git a/target/product/emulator.mk b/target/product/emulator.mk
new file mode 100644
index 0000000000..582ca644bd
--- /dev/null
+++ b/target/product/emulator.mk
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2012 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# This file is included by other product makefiles to add all the
+# emulator-related host modules to PRODUCT_PACKAGES.
+#
+
+PRODUCT_PACKAGES += \
+	emulator \
+	emulator-x86 \
+	emulator-arm \
+	emulator-mips \
+	emulator64-x86 \
+	emulator64-arm \
+	emulator64-mips \
+	libOpenglRender \
+	libGLES_CM_translator \
+	libGLES_V2_translator \
+	libEGL_translator \
+	lib64OpenglRender \
+	lib64GLES_CM_translator \
+	lib64GLES_V2_translator \
+	lib64EGL_translator
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 2c24b1aa28..ce8e63ed19 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -39,6 +39,8 @@ PRODUCT_PACKAGES += \
     PhaseBeam \
     VisualizationWallpapers
 
+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/sdk.mk b/target/product/sdk.mk
index 88fc2f37fe..287c7bfbf6 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -68,6 +68,7 @@ PRODUCT_PACKAGES := \
 	rild \
 	LegacyCamera
 
+include $(SRC_TARGET_DIR)/product/emulator.mk
 
 # Define the host tools and libs that are parts of the SDK.
 -include sdk/build/product_sdk.mk