aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Marshall <tdm.code@gmail.com>2020-08-17 09:37:08 -0700
committerTom Marshall <tdm.code@gmail.com>2020-08-17 09:37:08 -0700
commit24d335e62423b7828d33a4adc453071a358d6fc9 (patch)
treea98dd9fe93778ade24c10340f172a518c9fab46d
parentb8b4dd2e611e848acdc15eca64417e62d1d41b46 (diff)
jamesdsp: Fix multi-arch issue with LOCAL_POST_INSTALL_CMDHEADr11.1r11.0q10.0
LOCAL_POST_INSTALL_CMD runs once per arch. On the first run, only one of the built targets will be available and the second copy will fail. Depending on which order the targets are built, this may be a spurious warning or a build failure. Unfortunately, there does not seem to be a way to access the automatic target specific make varibles (like $@) in LOCAL_POST_INSTALL_CMD because kati escapes them all with backslashes. So just put a test for the target file's existence around the copy to fix the error. This will result in one of the target files being copied twice, but that is harmless. Change-Id: I87d7a9665757c70da85970addbe63fab14713452
-rw-r--r--jni/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/jni/Android.mk b/jni/Android.mk
index 2fb29da..58ac5f0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -33,7 +33,7 @@ LOCAL_POST_INSTALL_CMD := \
$(foreach l, lib $(if $(filter true,$(TARGET_IS_64_BIT)),lib64), \
$(eval _src := $(TARGET_OUT_VENDOR)/$(l)/soundfx/libjamesdsp.so) \
$(eval _dst := $(_overlay_path)/$(l)/soundfx/libjamesdsp.so) \
- mkdir -p $(dir $(_dst)) && $(ACP) $(_src) $(_dst) ; \
+ if [ -f $(_src) ]; then mkdir -p $(dir $(_dst)) && $(ACP) $(_src) $(_dst); fi; \
)
endif