diff options
| author | Colin Cross <ccross@android.com> | 2014-03-20 01:22:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 01:22:59 +0000 |
| commit | af9205626fdb92c1ebb4a229fd25a654c1cfdfcb (patch) | |
| tree | 8ce2c03618ea99d8a64c72a6646cb06c587cd442 /cmds | |
| parent | 674dd27ca17636360253a8f9ecdd7b382f3b5b8c (diff) | |
| parent | 0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1 (diff) | |
| download | frameworks_base-af9205626fdb92c1ebb4a229fd25a654c1cfdfcb.zip frameworks_base-af9205626fdb92c1ebb4a229fd25a654c1cfdfcb.tar.gz frameworks_base-af9205626fdb92c1ebb4a229fd25a654c1cfdfcb.tar.bz2 | |
am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1':
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. |