g12-common: Re-sync extract scripts with templates

Change-Id: I95866b7f7bf1ccd89669201aea7a44e649ac64f8

diff --git a/extract-files.sh b/extract-files.sh
index 4793fb313e1836aabaaef0ed7b1df4c83480d029..b3962d48589eee455df8caa44af7dd6cda618464 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,6 +14,10 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
 
+# If XML files don't have comments before the XML header, use this flag
+# Can still be used with broken XML files by using blob_fixup
+export TARGET_DISABLE_XML_FIXING=true
+
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 52215a1f01263533b7b5d3168cd02a7ffb69a1cd..961eb12838fc7482574cf82aa1b54f64fea3ddc6 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -33,14 +33,14 @@ write_makefiles "${MY_DIR}/proprietary-files.txt"
 # Include ATV specific blobs for ATV targets
 printf '\n%s\n' 'ifeq ($(PRODUCT_IS_ATV),true)' >> "$PRODUCTMK"
 
-write_makefiles "${MY_DIR}/proprietary-files-atv.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-atv.txt"
 
 printf '%s\n' 'endif' >> "$PRODUCTMK"
 
 # Allow opting out of OP-TEE
 printf '\n%s\n' 'ifneq ($(TARGET_HAS_TEE),false)' >> "$PRODUCTMK"
 
-write_makefiles "${MY_DIR}/proprietary-files-tee.txt" true
+write_makefiles "${MY_DIR}/proprietary-files-tee.txt"
 
 printf '%s\n' 'endif' >> "$PRODUCTMK"
 
@@ -59,10 +59,10 @@ if [ -s "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-files.txt" ]; the
 
     if [ "${TARGET_SOC}" == "g12a" ]
     then
-      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-g12a.txt" true
+      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-g12a.txt"
     elif [ "${TARGET_SOC}" == "sm1" ]
     then
-      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-sm1.txt" true
+      write_makefiles "${MY_DIR}/../../${VENDOR_COMMON}/${DEVICE_COMMON}/proprietary-files-sm1.txt"
     fi
 
     if [ -f "${MY_DIR}/../../${VENDOR_BRAND}/${DEVICE}/proprietary-firmware.txt" ]; then