ASAN: Fix ASAN directory in asan_extract.sh
Move things over to the new layout.
Bug: 36458146
Test: m && m SANITIZE_TARGET=address SANITIZE_TARGET_SYSTEM=true
Change-Id: I4dba269f82e4f88e39f926c6c2dd3c5efa07b2a1
diff --git a/rootdir/asan_extract.sh b/rootdir/asan_extract.sh
index 69f2eb3..c7d2fdf 100644
--- a/rootdir/asan_extract.sh
+++ b/rootdir/asan_extract.sh
@@ -25,6 +25,7 @@
SRC=/system/asan.tar.bz2
MD5_FILE=/data/asan.md5sum
+ASAN_DIR=/data/asan
if ! test -f $SRC ; then
log -p i -t asan_install "Did not find $SRC!"
@@ -43,7 +44,7 @@
fi
# Just clean up, helps with restorecon.
-rm -rf /data/lib /data/lib64 /data/vendor/lib*
+rm -rf $ASAN_DIR
log -p i -t asan_install "Untarring $SRC..."
@@ -52,7 +53,7 @@
# Cannot log here, log would run with system_data_file.
-restorecon -R -F /data/lib* /data/vendor/lib*
+restorecon -R -F $ASAN_DIR/*/lib*
log -p i -t asan_install "Fixed selinux labels..."