Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f0ffa8a3: Merge "app_process: use LOCAL_MULTILIB := both"

Browse Source 
* commit 'f0ffa8a38e90f64912686833dba9823b251fae57':
  app_process: use LOCAL_MULTILIB := both
This commit is contained in:
Colin Cross
2014-03-27 17:30:01 +00:00
committed by Android Git Automerger
parent eaab4df0dd f0ffa8a38e
commit 232d422405
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cmds/app_process/Android.mk
View File

@@ -14,30 +14,11 @@ LOCAL_SHARED_LIBRARIES := \
libandroid_runtime libandroid_runtime
LOCAL_MODULE:= app_process 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) 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. # Build a variant of app_process binary linked with ASan runtime.
# ARM-only at the moment. # ARM-only at the moment.
ifeq ($(TARGET_ARCH),arm) ifeq ($(TARGET_ARCH),arm)