summaryrefslogtreecommitdiffstats
path: root/cmds/app_process
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2014-05-06 23:30:40 +0800
committerNarayan Kamath <narayan@google.com>2014-05-14 18:48:42 +0100
commit559484ed6a3ed98980579e35d12543be2835aa35 (patch)
tree85168a027a7d7d333488e69da6337016d82c14e6 /cmds/app_process
parentb7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a (diff)
downloadframeworks_base-559484ed6a3ed98980579e35d12543be2835aa35.zip
frameworks_base-559484ed6a3ed98980579e35d12543be2835aa35.tar.gz
frameworks_base-559484ed6a3ed98980579e35d12543be2835aa35.tar.bz2
app_process: change app_process a symlink of primary version
Change app_process to be a symlink to the primary version and have app_process32/app_process64 be the 32-bit/64-bit versions respectively. This will make it possible to use the primary zygote for am/pm commands and other scripts that use app_process and don't need a specific zygote. Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Ibef545994eb95ddc82101c95df613ad1d06345e6
Diffstat (limited to 'cmds/app_process')
-rw-r--r--cmds/app_process/Android.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index 7c25354..74a2f7b 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -1,6 +1,5 @@
LOCAL_PATH:= $(call my-dir)
-# 32-bit app_process
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
@@ -15,10 +14,14 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE:= app_process
LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := app_process
+LOCAL_MODULE_STEM_32 := app_process32
LOCAL_MODULE_STEM_64 := app_process64
include $(BUILD_EXECUTABLE)
+# Create a symlink from app_process to app_process32 or 64
+# depending on the target configuration.
+include $(BUILD_SYSTEM)/executable_prefer_symlink.mk
+
# Build a variant of app_process binary linked with ASan runtime.
# ARM-only at the moment.
ifeq ($(TARGET_ARCH),arm)