Refine handling of apks: double-escaping, if/endif match

Change-Id: I3fc6a50daba83fee9901e76e506529074b40e7df

diff --git a/generate-blob-scripts.sh b/generate-blob-scripts.sh
index 027c821..0cd62a8 100755 (executable)
--- a/generate-blob-scripts.sh
+++ b/generate-blob-scripts.sh
@@ -231,6 +231,9 @@ do
     echo -n '# This file is generated by device/__MANUFACTURER__/__DEVICE__/'
     echo -n $FILESTYLE
     echo '-files.sh - DO NOT EDIT'
+    echo
+    echo ifeq \(\\\$\(TARGET_DEVICE\),$DEVICENAME\)
+    echo LOCAL_PATH:=\\\$\(call my-dir\)
 
     FOUND=false
     diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
@@ -242,10 +245,7 @@ do
         if test $FOUND = false
         then
           echo
-          echo ifeq \(\$\(TARGET_DEVICE\),$DEVICENAME\)
-          echo LOCAL_PATH:=\$\(call my-dir\)
-          echo
-          echo -n '# Makefile rules for apks on '
+          echo -n '# Module makefile rules for apks on '
           echo $DEVICENAME
         fi
         FOUND=true
@@ -253,21 +253,18 @@ do
         echo -n '# '
         echo $(basename $FULLPATH) | sed 's/\.apk//g'
         echo
-        echo include \$\(CLEAR_VARS\)
+        echo include \\\$\(CLEAR_VARS\)
         echo
         echo LOCAL_MODULE := $(basename $FULLPATH) | sed 's/\.apk//g'
-        echo LOCAL_SRC_FILES := \$\(LOCAL_MODULE\).apk
+        echo LOCAL_SRC_FILES := \\\$\(LOCAL_MODULE\).apk
         echo LOCAL_MODULE_CLASS := APPS
         echo LOCAL_MODULE_TAGS := optional
         echo LOCAL_CERTIFICATE := PRESIGNED
-        echo LOCAL_MODULE_SUFFIX := \$\(COMMON_ANDROID_PACKAGE_SUFFIX\)
-        echo include \$\(BUILD_PREBUILT\)
+        echo LOCAL_MODULE_SUFFIX := \\\$\(COMMON_ANDROID_PACKAGE_SUFFIX\)
+        echo include \\\$\(BUILD_PREBUILT\)
       done
-      if test $FOUND = true
-      then
-        echo
-        echo endif
-      fi
+    echo
+    echo endif
     echo
 
     echo 'EOF'