Merge "app_process: change app_process a symlink of primary version"

Author: narayank

cmds/app_process/Android.mk

@@ -1,6 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
 
-# 32-bit app_process
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
@@ -15,10 +14,14 @@ LOCAL_SHARED_LIBRARIES := \
 
 LOCAL_MODULE:= app_process
 LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := app_process
+LOCAL_MODULE_STEM_32 := app_process32
 LOCAL_MODULE_STEM_64 := app_process64
 include $(BUILD_EXECUTABLE)
 
+# Create a symlink from app_process to app_process32 or 64
+# depending on the target configuration.
+include  $(BUILD_SYSTEM)/executable_prefer_symlink.mk
+
 # Build a variant of app_process binary linked with ASan runtime.
 # ARM-only at the moment.
 ifeq ($(TARGET_ARCH),arm)