diff options
| author | Colin Cross <ccross@android.com> | 2014-03-20 01:55:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 01:55:52 +0000 |
| commit | 6ac8a20b8f2a2378e8fc6edec8deb42b7c09c2bf (patch) | |
| tree | eb35166c38dcb562aeb392462d9abf4f21061465 /cmds | |
| parent | 046e0a7ba68c95e303842812e835e0f321e8d892 (diff) | |
| parent | a78b389e544894ccb9673e2e416c3a1b51260513 (diff) | |
| download | frameworks_base-6ac8a20b8f2a2378e8fc6edec8deb42b7c09c2bf.zip frameworks_base-6ac8a20b8f2a2378e8fc6edec8deb42b7c09c2bf.tar.gz frameworks_base-6ac8a20b8f2a2378e8fc6edec8deb42b7c09c2bf.tar.bz2 | |
am a78b389e: am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit 'a78b389e544894ccb9673e2e416c3a1b51260513':
build app_process64 on 64-bit targets
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/Android.mk | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index b9afe40..cb7e1a0 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -1,4 +1,6 @@ LOCAL_PATH:= $(call my-dir) + +# 32-bit app_process include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ @@ -12,9 +14,29 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime LOCAL_MODULE:= app_process +LOCAL_32_BIT_ONLY := true +include $(BUILD_EXECUTABLE) + +ifeq ($(TARGET_IS_64_BIT),true) + +# 64-bit app_process64 +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + app_main.cpp + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libutils \ + liblog \ + libbinder \ + libandroid_runtime +LOCAL_MODULE:= app_process64 +LOCAL_NO_2ND_ARCH := true include $(BUILD_EXECUTABLE) +endif # TARGET_IS_64_BIT # Build a variant of app_process binary linked with ASan runtime. # ARM-only at the moment. |