diff options
| author | Colin Cross <ccross@android.com> | 2014-03-27 10:20:29 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-03-27 10:20:29 -0700 |
| commit | f130f0aaea58358dafbe83ccec2b5163b5bed1fb (patch) | |
| tree | 06be6d4b9de8764d34ef29e7dc2eca085833c2c4 /cmds/app_process | |
| parent | 5daf51c0fe6d5bea858c37291fed88bd3094d3ec (diff) | |
| download | frameworks_base-f130f0aaea58358dafbe83ccec2b5163b5bed1fb.zip frameworks_base-f130f0aaea58358dafbe83ccec2b5163b5bed1fb.tar.gz frameworks_base-f130f0aaea58358dafbe83ccec2b5163b5bed1fb.tar.bz2 | |
app_process: use LOCAL_MULTILIB := both
Use LOCAL_MULTILIB := both to build app_process64 instead of
duplicating the build rule.
Also causes PRODUCT_PACKAGES := app_process to install both
versions on 64-bit platforms, as the module names for both
app_process and app_process64 are now app_process.
Change-Id: Ia3c3265d15475771b0cae8bace53b8fbf351c186
Diffstat (limited to 'cmds/app_process')
| -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) |