g12a: Sync extract scripts with 22 templates

Change-Id: I7963ae050cfb193c5d0c2636da9c1e8f82bcdbdb

diff --git a/extract-files.sh b/extract-files.sh
index 561230218511a5a04cd9ad7b76b64c26d3582547..53282a99b51e68cb733f76a6de4b39027db857f5 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -14,12 +14,6 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
 
-export TARGET_ENABLE_CHECKELF=true
-
-# 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 2d2b55ca1c8b9ac65c98b23b07c191e1bb260b8d..de80952fef56bca22b8be19581013c40b11c8bc8 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -14,8 +14,6 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
 
-export TARGET_ENABLE_CHECKELF=true
-
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"