diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2011-06-10 09:40:04 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2011-06-10 10:13:23 -0700 |
commit | 74426d8bd16801a796c924afa368691f7b1633cc (patch) | |
tree | 1f6a704a570fd10a1ba43266b22e5de577fa83e3 | |
parent | c6df0e525fd39bb5dc82330c5ed04d0d1c2c20b6 (diff) | |
download | device_common-74426d8bd16801a796c924afa368691f7b1633cc.zip device_common-74426d8bd16801a796c924afa368691f7b1633cc.tar.gz device_common-74426d8bd16801a796c924afa368691f7b1633cc.tar.bz2 |
Refine handling of apks: double-escaping, if/endif match
Change-Id: I3fc6a50daba83fee9901e76e506529074b40e7df
-rwxr-xr-x | generate-blob-scripts.sh | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/generate-blob-scripts.sh b/generate-blob-scripts.sh index 027c821..0cd62a8 100755 --- 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' |