commit 504446c0de01011c83991ac9bc9c25448110a1a6
author Tom Marshall <tdm@cyngn.com> Fri Dec 12 11:56:04 2014 -0800
committer Griffin Millender <griffinn.millender@gmail.com> Thu May 07 17:51:00 2015 -0500
tree 4992afc8a4e06471b24cbeff1f277f58e281b36f
parent b07e51d0a27a2f871cb364f9e10cf26229d30093

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 250819a..457ce33 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -26,15 +26,15 @@
 
 # Backup Tool
 PRODUCT_COPY_FILES += \
-    vendor/slim/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
-    vendor/slim/prebuilt/common/bin/backuptool.functions:system/bin/backuptool.functions \
+    vendor/slim/prebuilt/common/bin/backuptool.sh:install/bin/backuptool.sh \
+    vendor/slim/prebuilt/common/bin/backuptool.functions:install/bin/backuptool.functions \
     vendor/slim/prebuilt/common/bin/50-slim.sh:system/addon.d/50-slim.sh \
     vendor/slim/prebuilt/common/bin/99-backup.sh:system/addon.d/99-backup.sh \
     vendor/slim/prebuilt/common/etc/backup.conf:system/etc/backup.conf
 
 # Signature compatibility validation
 PRODUCT_COPY_FILES += \
-    vendor/slim/prebuilt/common/bin/otasigcheck.sh:system/bin/otasigcheck.sh
+    vendor/slim/prebuilt/common/bin/otasigcheck.sh:install/bin/otasigcheck.sh
 
 # SLIM-specific init file
 PRODUCT_COPY_FILES += \

prebuilt/common/bin/backuptool.sh

diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index fc29f6a..fcbe8fd 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -7,6 +7,9 @@
 export S=/system
 export V=Slim-5.1
 
+# 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/