aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordianlujitao <dianlujitao@lineageos.org>2017-11-11 17:26:07 +0800
committerdianlujitao <dianlujitao@lineageos.org>2017-11-11 17:26:07 +0800
commit6dc3396b398e125ad3b11fbd1080e4f75339257e (patch)
tree259b087f89b89510a30041c600b63d3fc33dea04
parentcb5be28c9c8d07041ce4ae5d574b62ea47d76cba (diff)
downloadandroid_external_toybox-lineage-15.0.tar.gz
android_external_toybox-lineage-15.0.tar.bz2
android_external_toybox-lineage-15.0.zip
toybox: Allow building vendor toybox on non-Treble deviceslineage-15.0
* Vendor toybox can be used in vendor scripts. * If a target uses TARGET_COPY_OUT_VENDOR := system then writing to TARGET_OUT_VENDOR_EXECUTABLES can clobber things in system/bin, so add a guard to prevent this. Change-Id: I48d7cc20e654adc78e29a13c154a639971941cc7
-rw-r--r--Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index c4bf13dd..1638d5a1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -401,7 +401,8 @@ LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGE
include $(BUILD_EXECUTABLE)
-ifeq ($(PRODUCT_FULL_TREBLE),true)
+# Guard to prevent overwriting in system
+ifneq ($(TARGET_COPY_OUT_VENDOR),system)
############################################
# static version to be installed in /vendor
#