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

Commit f130f0aa authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 5daf51c0

cmds/app_process/Android.mk

+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)