diff options
| author | Colin Cross <ccross@android.com> | 2014-03-27 18:29:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 18:29:19 +0000 |
| commit | 1c14c327e8781d843c3b94252db391d1baeec23d (patch) | |
| tree | 1e9da8f7d9a7801f279bda0fc853cf1f223f2c5c /cmds | |
| parent | 350159c65a52092db04f1b8efce6943f61e50e73 (diff) | |
| parent | c1a7d0758de065da80129baa85f1471e67c7fe21 (diff) | |
| download | frameworks_base-1c14c327e8781d843c3b94252db391d1baeec23d.zip frameworks_base-1c14c327e8781d843c3b94252db391d1baeec23d.tar.gz frameworks_base-1c14c327e8781d843c3b94252db391d1baeec23d.tar.bz2 | |
am c1a7d075: am 232d4224: am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"
* commit 'c1a7d0758de065da80129baa85f1471e67c7fe21':
app_process: use LOCAL_MULTILIB := both
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/Android.mk | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index cb7e1a0..7c25354 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -14,30 +14,11 @@ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime LOCAL_MODULE:= app_process -LOCAL_32_BIT_ONLY := true +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := app_process +LOCAL_MODULE_STEM_64 := app_process64 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. ifeq ($(TARGET_ARCH),arm) |