summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-15 09:41:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-15 09:41:40 +0000
commiteabc93db1020be4b71f0db7d5b5d3a7991f3c264 (patch)
tree55afbba6f2ef664c708013aa6233fe580526184b /cmds
parentc0f18b9d0cce0c140b1274055faabff732f1e27c (diff)
parentc4c08803a8cc090aa27720e97df342231e8433af (diff)
downloadframeworks_base-eabc93db1020be4b71f0db7d5b5d3a7991f3c264.zip
frameworks_base-eabc93db1020be4b71f0db7d5b5d3a7991f3c264.tar.gz
frameworks_base-eabc93db1020be4b71f0db7d5b5d3a7991f3c264.tar.bz2
am c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit 'c4c08803a8cc090aa27720e97df342231e8433af': app_process: change app_process a symlink of primary version
Diffstat (limited to 'cmds')
-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)