backuptool: Remove backup blacklist/whitelist
Change-Id: Ia89e6fa4c31377a429e0dfa912d0b61393696009
diff --git a/config/common.mk b/config/common.mk
index 3fe16bf..6b21d99 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -54,8 +54,7 @@
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/common/bin/50-hosts.sh:system/addon.d/50-hosts.sh \
vendor/omni/prebuilt/common/bin/backuptool.sh:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.sh \
- vendor/omni/prebuilt/common/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions \
- vendor/omni/prebuilt/common/bin/blacklist:$(TARGET_COPY_OUT_SYSTEM)/addon.d/blacklist
+ vendor/omni/prebuilt/common/bin/backuptool.functions:$(TARGET_COPY_OUT_SYSTEM)/bin/backuptool.functions
endif
# Backup Services whitelist
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 410c410..9853eed 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -37,16 +37,6 @@
fi
}
-check_blacklist() {
- if [ -f $S/addon.d/blacklist ];then
- ## Discard any known bad backup scripts
- for f in /$1/addon.d/*sh; do
- s=$(md5sum $f | awk {'print $1'})
- grep -q $s $S/addon.d/blacklist && rm -f $f
- done
- fi
-}
-
# Execute /system/addon.d/*.sh scripts with $1 parameter
run_stage() {
for script in $(find /tmp/addon.d/ -name '*.sh' |sort -n); do
@@ -92,7 +82,6 @@
mount_system
mkdir -p $C
#check_prereq
- check_blacklist $S
preserve_addon_d
run_stage pre-backup
run_stage backup
@@ -103,7 +92,6 @@
cp $S/bin/backuptool.functions /tmp
mount_system
check_prereq
- check_blacklist /tmp
run_stage pre-restore
run_stage restore
run_stage post-restore
diff --git a/prebuilt/common/bin/backuptool_ab.sh b/prebuilt/common/bin/backuptool_ab.sh
index 02b27f6..2a8c3d9 100755
--- a/prebuilt/common/bin/backuptool_ab.sh
+++ b/prebuilt/common/bin/backuptool_ab.sh
@@ -56,36 +56,6 @@
return 0
}
-check_blacklist() {
- if [ -f /system/addon.d/blacklist -a -d /$1/addon.d/ ]; then
- ## Discard any known bad backup scripts
- cd /$1/addon.d/
- for f in *sh; do
- [ -f $f ] || continue
- s=$(md5sum $f | cut -c-32)
- grep -q $s /system/addon.d/blacklist && rm -f $f
- done
- fi
-}
-
-check_whitelist() {
- found=0
- if [ -f /system/addon.d/whitelist ];then
- ## forcefully keep any version-independent stuff
- cd /$1/addon.d/
- for f in *sh; do
- s=$(md5sum $f | cut -c-32)
- grep -q $s /system/addon.d/whitelist
- if [ $? -eq 0 ]; then
- found=1
- else
- rm -f $f
- fi
- done
- fi
- return $found
-}
-
# Execute /system/addon.d/*.sh scripts with $1 parameter
run_stage() {
log -t "update_engine" $1
@@ -115,7 +85,6 @@
fi
log -t "update_engine" "backuptool_ab.sh backup"
- check_blacklist postinstall/system
preserve_addon_d
run_stage pre-backup
run_stage backup
@@ -129,7 +98,6 @@
fi
log -t "update_engine" "backuptool_ab.sh restore"
- check_blacklist postinstall/tmp
run_stage pre-restore
run_stage restore
run_stage post-restore
diff --git a/prebuilt/common/bin/blacklist b/prebuilt/common/bin/blacklist
deleted file mode 100644
index 03c36c4..0000000
--- a/prebuilt/common/bin/blacklist
+++ /dev/null
@@ -1,4 +0,0 @@
-80f99c594f7b82c4cbe533e3f5447729
-29f4bab6bae5959458678869350dc888
-77d73f73da664f3592e712b7e7c107c1
-a5019b358023a3a6ae8be3f3380ba5ca