Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1a7d075 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '232d4224':
  app_process: use LOCAL_MULTILIB := both
parents 6984e4f9 232d4224
Loading
Loading
Loading
Loading
+3 −22
Original line number Diff line number Diff line
@@ -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)