diff options
| author | Colin Cross <ccross@android.com> | 2014-03-19 18:19:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 18:19:25 -0700 |
| commit | 0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1 (patch) | |
| tree | 51f5e5ac77c055c68ff78de350dfebd8de600eff /cmds | |
| parent | a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc (diff) | |
| parent | 19fc55e1e3a51aba4db985d186d1f4ec075d7ca1 (diff) | |
| download | frameworks_base-0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1.zip frameworks_base-0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1.tar.gz frameworks_base-0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1.tar.bz2 | |
am 19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
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. |