am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets"

* commit '49fca697470b8321a02bdd2a828e9beec1ef1182':
  build app_process64 on 64-bit targets
This commit is contained in:
Colin Cross
2014-03-20 01:49:57 +00:00
committed by Android Git Automerger

View File

@@ -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.