diff --git a/build/envsetup.sh b/build/envsetup.sh
index e06b0e6..c22b9d6 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -883,8 +883,10 @@
         rm -f $OUT/.chkfileperm.sh
     fi
 
+    RELOUT=$(echo $OUT | sed "s#^${ANDROID_BUILD_TOP}/##")
+
     stop_n_start=false
-    for TARGET in $(echo $LOC | tr " " "\n" | sed "s#.*$OUT##" | sort | uniq); do
+    for TARGET in $(echo $LOC | tr " " "\n" | sed "s#.*${RELOUT}##" | sort | uniq); do
         # Make sure file is in $OUT/system or $OUT/data
         case $TARGET in
             /system/*|/data/*)