summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-15 09:36:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-15 09:36:28 +0000
commitc4c08803a8cc090aa27720e97df342231e8433af (patch)
treeda20a06095ae9de7a069b56563b0b40b96fb06a5
parentc4c77d63d889baca2abbdce6326077f0911b279e (diff)
parent559484ed6a3ed98980579e35d12543be2835aa35 (diff)
downloadbase-c4c08803a8cc090aa27720e97df342231e8433af.tar.gz
Merge "app_process: change app_process a symlink of primary version"
-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 7c253540eaba..74a2f7bea95a 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)