aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools
diff options
context:
space:
mode:
authorGravatar stani <stani@google.com>2016-06-21 13:13:19 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-21 13:13:20 -0700
commita80bb676d3432c202c633f9e6fb05d2348d7aa04 (patch)
tree16979e5915e5af0ec8b25dcf071b91fa11d1bf9c /platform_tools
parent7e5e594ea6fe0179b35e9d6ecb9d40cf0313f564 (diff)
Remove check for cmake in android make script.
Update docs explaining how to setup Android SDK. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2084763003 DOCS_PREVIEW= https://skia.org/?cl=2084763003 Review-Url: https://codereview.chromium.org/2084763003
Diffstat (limited to 'platform_tools')
-rwxr-xr-xplatform_tools/android/bin/android_setup.sh7
1 files changed, 0 insertions, 7 deletions
diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh
index 0a6fd5f0ab..d092922416 100755
--- a/platform_tools/android/bin/android_setup.sh
+++ b/platform_tools/android/bin/android_setup.sh
@@ -87,13 +87,6 @@ fi
if [ "$SKIA_VULKAN" == "true" ]; then
export GYP_DEFINES="skia_vulkan=1 $GYP_DEFINES"
- # add cmake from the SDK to your path if it doesn't exist
- if [ ! -d "${ANDROID_SDK_ROOT}/cmake" ]; then
- echo "The Android SDK Tools version of CMake is required to build Vulkan. ${ANDROID_SDK_ROOT}/cmake"
- exit 1
- else
- export PATH=${ANDROID_SDK_ROOT}/cmake/bin:$PATH
- fi
fi
# Helper function to configure the GYP defines to the appropriate values