diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2014-04-17 18:27:58 +0100 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2014-04-17 18:27:58 +0100 |
| commit | 5e119fab784728e1607992641f33926bce1c362e (patch) | |
| tree | 02e6d5f26b7330d92531cc0a27e0ff2620012576 | |
| parent | 8e90f4ee09b755e4dc5a38aa2a5b817da730f798 (diff) | |
| download | base-linaro-juice2.tar.gz | |
app_process: change to create app_process link to app_process64linaro-juice2
since commands like am/pm use app_process to run java classes,
if we only have 64 bit version in the system, these commands will be failed.
use symbol link to it is a work around.
but which version should be used for am/pm when both enabled need to be talked with google and arm.
before that we use the link here since we only have 64 bit version installed now,
so that we can have cts run on the images
Change-Id: I5d785e3c7f43d9f59f62327600a3e0eb2e4093e1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | cmds/app_process/Android.mk | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk index 7c253540eaba..2a3f337bc81b 100644 --- a/cmds/app_process/Android.mk +++ b/cmds/app_process/Android.mk @@ -19,6 +19,24 @@ LOCAL_MODULE_STEM_32 := app_process LOCAL_MODULE_STEM_64 := app_process64 include $(BUILD_EXECUTABLE) +ifneq ($(strip $(APP_PROCESS_LINK)),) +SYMLINK := $(addprefix $(TARGET_OUT)/bin/, $(LOCAL_MODULE)) +$(SYMLINK): APP_PROCESS_BINARY := $(LOCAL_MODULE_STEM_64) +$(SYMLINK): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk + @echo "Symlink: $@ -> $(APP_PROCESS_BINARY)" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf $(APP_PROCESS_BINARY) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINK) + +# We need this so that the installed files could be picked up based on the +# local module name +ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ + $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS) + +endif + # Build a variant of app_process binary linked with ASan runtime. # ARM-only at the moment. ifeq ($(TARGET_ARCH),arm) |