DEPS - Issue 1930423002: Require Android SDK copy of CMake to build Vulkan on Android.

Side by Side Diff: DEPS

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, 7 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 unified diff | Download patch

« no previous file with comments | « no previous file | platform_tools/android/bin/android_setup.sh » ('j') | no next file with comments »

OLD	NEW
1 use_relative_paths = True	1 use_relative_paths = True

2	2

3 # Dependencies on outside packages.	3 # Dependencies on outside packages.

4 #	4 #

5 deps = {	5 deps = {

6 "common": "https://skia.googlesource.com/common.git@c282fe0b6e392b14f88d647cbd 86e1a3ef5498e0",	6 "common": "https://skia.googlesource.com/common.git@c282fe0b6e392b14f88d647cbd 86e1a3ef5498e0",

7	7

8 # There is some duplication here that might be worth cleaning up:	8 # There is some duplication here that might be worth cleaning up:

9 # - can use use our existing t_p/e/libjpeg instead of pulling it for Android ?	9 # - can use use our existing t_p/e/libjpeg instead of pulling it for Android ?

10	10

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 "third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9 b526d28cb2d7f0ccff0613c94bb52abc8f53b6f",	46 "third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9 b526d28cb2d7f0ccff0613c94bb52abc8f53b6f",

47	47

48 # microhttpd for skiaserve	48 # microhttpd for skiaserve

49 "third_party/externals/microhttpd" : "https://android.googlesource.com/platfor m/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",	49 "third_party/externals/microhttpd" : "https://android.googlesource.com/platfor m/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",

50	50

51 # shaderc for the vulkan backend	51 # shaderc for the vulkan backend

52 "third_party/externals/shaderc2" : "https://github.com/google/shaderc.git@7308 a2cacffce47cc944a59b411ab065c01c3f03",	52 "third_party/externals/shaderc2" : "https://github.com/google/shaderc.git@7308 a2cacffce47cc944a59b411ab065c01c3f03",

53 "third_party/externals/shaderc2/third_party/googletest" : "https://github.com/ google/googletest.git@d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0",	53 "third_party/externals/shaderc2/third_party/googletest" : "https://github.com/ google/googletest.git@d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0",

54 "third_party/externals/shaderc2/third_party/glslang" : "https://github.com/goo gle/glslang.git@e1cd410d9c03a24c00c570c91a99cad88bb475d1",	54 "third_party/externals/shaderc2/third_party/glslang" : "https://github.com/goo gle/glslang.git@e1cd410d9c03a24c00c570c91a99cad88bb475d1",

55 "third_party/externals/shaderc2/third_party/spirv-tools" : "https://github.com /KhronosGroup/SPIRV-Tools.git@009c4358b5a1c93203166b3ed60a548f63522e81",	55 "third_party/externals/shaderc2/third_party/spirv-tools" : "https://github.com /KhronosGroup/SPIRV-Tools.git@009c4358b5a1c93203166b3ed60a548f63522e81",

56 "third_party/externals/shaderc2/third_party/android-cmake" : "https://github.c om/taka-no-me/android-cmake.git@556cc14296c226f753a3778d99d8b60778b7df4f",

57 }	56 }

58	57

59 deps_os = {	58 deps_os = {

60 'llvm': {	59 'llvm': {

61 # xSAN bots build Clang from scratch.	60 # xSAN bots build Clang from scratch.

62 "third_party/externals/llvm": "https://llvm.googlesource.com/llvm@release_38 ",	61 "third_party/externals/llvm": "https://llvm.googlesource.com/llvm@release_38 ",

63 "third_party/externals/llvm/tools/clang": "https://llvm.googlesource.com/cla ng@release_38",	62 "third_party/externals/llvm/tools/clang": "https://llvm.googlesource.com/cla ng@release_38",

64 "third_party/externals/llvm/projects/compiler-rt": "https://llvm.googlesourc e.com/compiler-rt@release_38",	63 "third_party/externals/llvm/projects/compiler-rt": "https://llvm.googlesourc e.com/compiler-rt@release_38",

65 "third_party/externals/llvm/projects/libcxx": "https://llvm.googlesource.com /libcxx@release_38",	64 "third_party/externals/llvm/projects/libcxx": "https://llvm.googlesource.com /libcxx@release_38",

66 "third_party/externals/llvm/projects/libcxxabi": "https://llvm.googlesource. com/libcxxabi@release_38",	65 "third_party/externals/llvm/projects/libcxxabi": "https://llvm.googlesource. com/libcxxabi@release_38",

67 }	66 }

68 }	67 }

69	68

70 recursedeps = [ "common" ]	69 recursedeps = [ "common" ]

OLD	NEW