diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-15 10:34:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-15 10:34:43 +0000 |
| commit | 72a194e6d5d8427ee9816364781b180afffc5393 (patch) | |
| tree | 6c9ea3a505e79fec7400654915fa04ad36a07326 /cmds | |
| parent | 1e74c37f8e1acb595f407e0f65744bb6b00c9314 (diff) | |
| parent | 1810927a9b8f6d2597d18c0e77389b4a6fcb5118 (diff) | |
| download | frameworks_base-72a194e6d5d8427ee9816364781b180afffc5393.zip frameworks_base-72a194e6d5d8427ee9816364781b180afffc5393.tar.gz frameworks_base-72a194e6d5d8427ee9816364781b180afffc5393.tar.bz2 | |
am 1810927a: am eabc93db: am c4c08803: Merge "app_process: change app_process a symlink of primary version"
* commit '1810927a9b8f6d2597d18c0e77389b4a6fcb5118':
app_process: change app_process a symlink of primary version
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/Android.mk | 7 |
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) |