commit 65aff66ecbdc15a7ac43b41be857b9fc820f57a3
author Tom Marshall <tdm@cyngn.com> Fri Dec 12 11:56:04 2014 -0800
committer Tom Marshall <tdm@cyngn.com> Tue Jan 13 21:54:18 2015 +0000
tree 210a71749809e310939f1b63c9c1dc2a73d4fa02
parent ba52ed6d4206c69d1dab7a433ad1ad44fffd98ef

cm: Put install tools in OUT/install

 * This allows us to avoid modifying /system at install time.

Change-Id: I747551d7f38a3eef70ab64f32b6d4a4749c01012

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 96f459f..6c8a1f6 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -81,15 +81,15 @@
 # Backup Tool
 ifneq ($(WITH_GMS),true)
 PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/cm/prebuilt/common/bin/backuptool.functions:system/bin/backuptool.functions \
+    vendor/cm/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
+    vendor/cm/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
     vendor/cm/prebuilt/common/bin/50-cm.sh:system/addon.d/50-cm.sh \
     vendor/cm/prebuilt/common/bin/blacklist:system/addon.d/blacklist
 endif
 
 # Signature compatibility validation
 PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/bin/otasigcheck.sh:system/bin/otasigcheck.sh
+    vendor/cm/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
 
 # init.d support
 PRODUCT_COPY_FILES += \

prebuilt/common/bin/backuptool.sh

diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 35ba51c..bf71149 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -7,6 +7,9 @@
 export S=/system
 export V=12
 
+# Scripts in /system/addon.d expect to find backuptool.functions in /tmp
+cp -f /tmp/install/bin/backuptool.functions /tmp
+
 # Preserve /system/addon.d in /tmp/addon.d
 preserve_addon_d() {
   mkdir -p /tmp/addon.d/