summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJesse Hall <jessehall@google.com>2012-11-28 09:53:20 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-04-13 05:39:17 -0700
commitd1d71f6857bbb5025284a245cd509d802ad3a604 (patch)
tree1f9f090ffd1e8405b160fbb6eb847b79cbf3ee46 /target
parent659282bff57f0b50fcc95e8613f66f57aa1d0a82 (diff)
downloadbuild-d1d71f6857bbb5025284a245cd509d802ad3a604.zip
build-d1d71f6857bbb5025284a245cd509d802ad3a604.tar.gz
build-d1d71f6857bbb5025284a245cd509d802ad3a604.tar.bz2
Add emulator modules to PRODUCT_PACKAGES in full and sdk products
Bug: 7556265 Change-Id: Ie84f5ed6b17cccea7e6181f16686e2aac6955f1a
Diffstat (limited to 'target')
-rw-r--r--target/product/emulator.mk36
-rw-r--r--target/product/full_base.mk2
-rw-r--r--target/product/sdk.mk1
3 files changed, 39 insertions, 0 deletions
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
new file mode 100644
index 0000000..582ca64
--- /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 4776baa..2353fc4 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -43,6 +43,8 @@ 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/sdk.mk b/target/product/sdk.mk
index 760d4a8..59dc573 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -69,6 +69,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