Revert "Add more soong config variables to build-prebuilts.sh"
This reverts commit 179da4cda96e38f42eff387472460b4ecae9b815.
Reason for revert: Breaks aosp/clang-tools branch
Change-Id: I705153d0ecdd439546d36b9d56ef31cb4105c265
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 20e5d33..98b33c2 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -19,20 +19,8 @@
exit 1
fi
-if [ ! -e "build/envsetup.sh" ]; then
- echo "error: Current working directory must be ANDROID_BUILD_TOP"
- exit 1
-fi
+TOP=$(pwd)
-TOP="$(pwd)"
-
-# Read PLATFORM_SDK_VERSION
-set +x
-source "build/envsetup.sh"
-PLATFORM_SDK_VERSION="$(get_build_var PLATFORM_SDK_VERSION)"
-set -x
-
-# Read OS name
UNAME="$(uname)"
case "${UNAME}" in
Linux)
@@ -55,16 +43,7 @@
cat > "${SOONG_OUT}/soong.variables" << __EOF__
{
"Allow_missing_dependencies": true,
-
- "HostArch":"x86_64",
-
- "DeviceAbi": ["arm64-v8a"],
- "DeviceArch":"arm64",
- "DeviceArchVariant": "armv8-a",
- "DeviceCpuVariant": "generic",
- "DeviceName": "generic_arm64",
-
- "Platform_sdk_version": ${PLATFORM_SDK_VERSION}
+ "HostArch":"x86_64"
}
__EOF__
