Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/build_shaderc.py

Issue 1930423002: Require Android SDK copy of CMake to build Vulkan on Android. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « platform_tools/android/bin/android_setup.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/build_shaderc.py
diff --git a/tools/build_shaderc.py b/tools/build_shaderc.py
index 0a3fc3aa2864746a8065f4c832f1ac4b07b39bcf..d1ece210d9d5c6d9b89a802ef0062c8797206080 100644
--- a/tools/build_shaderc.py
+++ b/tools/build_shaderc.py
@@ -73,8 +73,9 @@ def main():
'-DSPIRV_SKIP_EXECUTABLES=ON',
'-DSHADERC_ENABLE_SHARED_CRT=ON']
if args.android_toolchain and args.android_toolchain.strip() :
- cmake_cmd.append('-DCMAKE_TOOLCHAIN_FILE=' + args.src_dir +\
- '/third_party/android-cmake/android.toolchain.cmake')
+ cmake_cmd.append('-DCMAKE_TOOLCHAIN_FILE=' +\
+ os.environ['ANDROID_SDK_ROOT'] +\
+ '/cmake/android.toolchain.cmake')
cmake_cmd.append('-DANDROID_TOOLCHAIN_NAME=standalone-clang')
cmake_cmd.append('-DANDROID_STANDALONE_TOOLCHAIN=' +\
os.path.abspath(args.android_toolchain))
« no previous file with comments | « platform_tools/android/bin/android_setup.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698