DO NOT MERGE ANYWHERE - Update master-ndk-shader-tools to use main branch.

Bug: b/289400079 Change-Id: Iad0a7d0531bd5cf17e458bb1f99e941daba787f3
Fix spirv-headers checkout path to under spirv-tools/external/.
2025-11-27 23:20:49 +08:00 · 2023-07-31 09:32:04 -07:00 · 2016-07-20 15:14:06 -04:00 · 2016-05-10 17:04:31 -04:00 · 2016-03-17 15:08:05 -07:00 · 2016-02-26 15:24:38 -08:00
1 changed files with 36 additions and 56 deletions
--- a/default.xml
+++ b/default.xml
@@ -1,67 +1,47 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <manifest>
+  <![CDATA[
+    Manifest for building NDK shader-tools from main.

+    Uses prebuilts for cmake, ninja, and python where necessary.
+
+    To build this project, run src/shaderc/utils/build.py --installdir $DIST_DIR.
+
+    Then executables are in:
+          $DIST_DIR/glslc/glslc
+          $DIST_DIR/third_party/spirv-tools/spirv-as
+          $DIST_DIR/third_party/spirv-tools/spirv-dis
+          $DIST_DIR/third_party/spirv-tools/spirv-val
+
+
+   For testing, use:
+           fetch="https://android.googlesource.com/"
+  ]]>
  <remote  name="aosp"
           fetch=".."
           review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/webview-m40_r1"
-           remote="aosp"
-           sync-j="4" />
+  <default revision="main"
+           remote="aosp" />
+  <project path="src/shaderc" name="platform/external/shaderc/shaderc" />
+  <project path="src/shaderc/third_party/glslang" name="platform/external/shaderc/glslang" />
+  <project path="src/shaderc/third_party/spirv-tools" name="platform/external/shaderc/spirv-tools" />
+  <project path="src/shaderc/third_party/spirv-tools/external/spirv-headers" name="platform/external/shaderc/spirv-headers" />
+  <project path="src/shaderc/third_party/googletest" name="platform/external/googletest" revision="82b11b8cfcca464c2ac74b623d04e74452e74f32" />

-  <!-- Build system essentials -->
-  <project path="build" name="platform/build" groups="pdk">
-    <copyfile src="core/root.mk" dest="Makefile"/>
-  </project>
-  <project path="external/jarjar" name="platform/external/jarjar" groups="pdk"/>
-  <project path="external/proguard" name="platform/external/proguard" groups="pdk-java"/>
-  <project path="prebuilts/clang/linux-x86/host/3.5" name="platform/prebuilts/clang/linux-x86/host/3.5" groups="pdk,linux"/>
-  <project path="prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9" groups="pdk,linux,arm"/>
-  <project path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.8" groups="pdk,linux,arm"/>
-  <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6" groups="pdk,linux"/>
-  <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9"/>
-  <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.8" groups="pdk,linux,x86"/>
-  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" groups="pdk"/>
-  <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk"/>

-  <!-- Chromium sources -->
-  <project path="external/chromium_org" name="platform/external/chromium_org"/>
-  <project path="external/chromium_org/sdch/open-vcdiff" name="platform/external/chromium_org/sdch/open-vcdiff"/>
-  <project path="external/chromium_org/testing/gtest" name="platform/external/chromium_org/testing/gtest"/>
-  <project path="external/chromium_org/third_party/WebKit" name="platform/external/chromium_org/third_party/WebKit"/>
-  <project path="external/chromium_org/third_party/angle" name="platform/external/chromium_org/third_party/angle"/>
-  <project path="external/chromium_org/third_party/boringssl/src" name="platform/external/chromium_org/third_party/boringssl/src"/>
-  <project path="external/chromium_org/third_party/brotli/src" name="platform/external/chromium_org/third_party/brotli/src"/>
-  <project path="external/chromium_org/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille" name="platform/external/chromium_org/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille"/>
-  <project path="external/chromium_org/third_party/freetype" name="platform/external/chromium_org/third_party/freetype"/>
-  <project path="external/chromium_org/third_party/icu" name="platform/external/chromium_org/third_party/icu"/>
-  <project path="external/chromium_org/third_party/leveldatabase/src" name="platform/external/chromium_org/third_party/leveldatabase/src"/>
-  <project path="external/chromium_org/third_party/libaddressinput/src" name="platform/external/chromium_org/third_party/libaddressinput/src"/>
-  <project path="external/chromium_org/third_party/libjingle/source/talk" name="platform/external/chromium_org/third_party/libjingle/source/talk"/>
-  <project path="external/chromium_org/third_party/libjpeg_turbo" name="platform/external/chromium_org/third_party/libjpeg_turbo"/>
-  <project path="external/chromium_org/third_party/libphonenumber/src/phonenumbers" name="platform/external/chromium_org/third_party/libphonenumber/src/phonenumbers"/>
-  <project path="external/chromium_org/third_party/libphonenumber/src/resources" name="platform/external/chromium_org/third_party/libphonenumber/src/resources"/>
-  <project path="external/chromium_org/third_party/libsrtp" name="platform/external/chromium_org/third_party/libsrtp"/>
-  <project path="external/chromium_org/third_party/libvpx" name="platform/external/chromium_org/third_party/libvpx"/>
-  <project path="external/chromium_org/third_party/libyuv" name="platform/external/chromium_org/third_party/libyuv"/>
-  <project path="external/chromium_org/third_party/mesa/src" name="platform/external/chromium_org/third_party/mesa/src"/>
-  <project path="external/chromium_org/third_party/openmax_dl" name="platform/external/chromium_org/third_party/openmax_dl"/>
-  <project path="external/chromium_org/third_party/opus/src" name="platform/external/chromium_org/third_party/opus/src"/>
-  <project path="external/chromium_org/third_party/ots" name="platform/external/chromium_org/third_party/ots"/>
-  <project path="external/chromium_org/third_party/sfntly/cpp/src" name="platform/external/chromium_org/third_party/sfntly/cpp/src"/>
-  <project path="external/chromium_org/third_party/skia" name="platform/external/chromium_org/third_party/skia"/>
-  <project path="external/chromium_org/third_party/smhasher/src" name="platform/external/chromium_org/third_party/smhasher/src"/>
-  <project path="external/chromium_org/third_party/usrsctp/usrsctplib" name="platform/external/chromium_org/third_party/usrsctp/usrsctplib"/>
-  <project path="external/chromium_org/third_party/webrtc" name="platform/external/chromium_org/third_party/webrtc"/>
-  <project path="external/chromium_org/third_party/yasm/source/patched-yasm" name="platform/external/chromium_org/third_party/yasm/source/patched-yasm"/>
-  <project path="external/chromium_org/tools/grit" name="platform/external/chromium_org/tools/grit"/>
-  <project path="external/chromium_org/tools/gyp" name="platform/external/chromium_org/tools/gyp"/>
-  <project path="external/chromium_org/v8" name="platform/external/chromium_org/v8"/>
+ <![CDATA[
+   Get prebuilt cmake, ninja, and python.
+ ]]>

-  <!-- cpufeatures static library -->
-  <project path="ndk" name="platform/ndk"/>
+ <project path="prebuilts/cmake/darwin-x86" name="platform/prebuilts/cmake/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" />
+ <project path="prebuilts/cmake/linux-x86" name="platform/prebuilts/cmake/linux-x86" clone-depth="1" groups="notdefault,platform-linux" />
+ <project path="prebuilts/cmake/windows-x86" name="platform/prebuilts/cmake/windows-x86" clone-depth="1" groups="notdefault,platform-cygwin_nt-6.1,platform-cygwin_nt-6.2,platform-cygwin_nt-6.3,platform-cygwin_nt-10.0" />

-  <!-- Java static library dependencies -->
-  <project path="external/guava" name="platform/external/guava" groups="pdk-cw-fs"/>
-  <project path="external/jsr305" name="platform/external/jsr305" groups="pdk-cw-fs"/>
+ <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" />
+ <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" clone-depth="1" groups="notdefault,platform-linux" />
+ <project path="prebuilts/ninja/windows-x86" name="platform/prebuilts/ninja/windows-x86" clone-depth="1" groups="notdefault,platform-cygwin_nt-6.1,platform-cygwin_nt-6.2,platform-cygwin_nt-6.3,platform-cygwin_nt-10.0" />

+ <project path="prebuilts/python/darwin-x86" name="platform/prebuilts/python/darwin-x86" clone-depth="1" groups="notdefault,platform-darwin" />
+ <project path="prebuilts/python/linux-x86" name="platform/prebuilts/python/linux-x86" clone-depth="1" groups="notdefault,platform-linux" />
+ <project path="prebuilts/python/windows-x86" name="platform/prebuilts/python/windows-x86" clone-depth="1" groups="notdefault,platform-cygwin_nt-6.1,platform-cygwin_nt-6.2,platform-cygwin_nt-6.3,platform-cygwin_nt-10.0" />
 </manifest>
Author	SHA1	Message	Date
Xin Li	f05f4b4247	DO NOT MERGE ANYWHERE - Update master-ndk-shader-tools to use main branch. Bug: b/289400079 Change-Id: Iad0a7d0531bd5cf17e458bb1f99e941daba787f3	2023-07-31 09:32:04 -07:00
Lei Zhang	0a12e29326	Fix spirv-headers checkout path to under spirv-tools/external/. Change-Id: I2349e4cf02e15a46463ffd6cddf6ece06b29de8d	2016-07-20 15:14:06 -04:00
Lei Zhang	8b9da4d63f	Add new dependency project for spirv-tools: spirv-headers. Change-Id: I8e4c58a07018edf4a7dcfd75ca4f73274dd69e0a	2016-05-10 17:04:31 -04:00
Dejan Mircevski	5aab84471f	Add Python and update build comments. Change-Id: I343aa3c64dfa020898ce8f535cac32f66fb18202	2016-03-17 15:08:05 -07:00
David Neto	540324ff1b	Use prebuilt cmake and ninja. Force use of compiler "cl" for Windows, to get MSVC.	2016-02-26 15:24:38 -08:00
Dan Albert	004a84b70c	Add manifest for NDK shader-tools on master.	2016-02-24 12:41:38 -08:00
Dan Albert	f30fc1941f	Remove a failed experiment.	2016-02-23 12:43:52 -08:00
Dan Albert	43eef65c28	Add shaderc components to the NDK manifest.	2016-02-23 10:27:11 -08:00
Dan Albert	9fc03c2d07	Revert "Remove legacy clang directories from the manifest." Apparently these are still in use by some parts of the build. Will need to fix that, but for now just revert. This reverts commit `38e8fe7e57`. Change-Id: I555bd68b399941c33add151e434ac8a8c5c40f62	2015-12-05 19:40:55 +00:00
Dan Albert	38e8fe7e57	Remove legacy clang directories from the manifest.	2015-12-04 21:38:38 -08:00
Stephen Hines	2dc7a6b167	Add new prebuilts/clang/host/* projects to master-ndk manifest. Change-Id: I69b940677ea3e3fcef570ba8c1afe2b1023d2a8a	2015-10-08 14:09:18 -07:00
Dan Albert	d035665c8d	Add chromite to the NDK branch. Not really necessary for local development, but it's needed by the CI.	2015-09-15 14:12:24 -07:00
Dan Albert	6baa2a52ff	Switch to master GCC branch.	2015-08-27 15:26:32 -07:00
Dan Albert	77a5af4b94	DO NOT MERGE Use the development branch of prebuilts/ndk.	2015-08-24 23:06:03 +00:00
Dan Albert	e7b03352ab	Remove Perl sources from the manifest. This is no longer used. Bug: http://b/22413538	2015-07-31 16:25:16 -07:00
Dan Albert	ea006304fc	Remove external/clang from the manifest. We only needed this for the static analyzer tools, which are now in the prebuilts directories.	2015-07-28 15:55:44 -07:00
Elliott Hughes	87bf9b98bc	Remove target 4.8 toolchains. Change-Id: I17f1cd4f274c3a7607f389e352e98e4fd45997db	2015-07-13 12:16:41 -07:00
Elliott Hughes	00c08cf3e0	Add toolchain/sed to the NDK manifest. Change-Id: I1788fd6667d0715804df24d70beabd931d246446	2015-07-10 11:46:18 -07:00
Dan Albert	ddfe0065a3	Add Windows clang to the prebuilts. Mapping it at a different path to match the other host prebuilts. Once the Linux and Darwin prebuilts are fixed to fit the new layout we'll move Windows back to where it ought to be. Change-Id: I186e02583346dec7cffcf1d2f5c45a41dac4ca75	2015-07-08 12:41:01 -07:00
Dan Albert	748067bdbe	Put clang back in the manifest. We still need this because we pull the analyzer scripts from here (they aren't installed in the prebuilts directory). We'll want to move to having it installed in prebuilts eventually, but the minimal fix is fine for now. This went unnoticed because failures from build-analyzer.sh do not cause build-host-prebuilts.sh to fail (which I'll fix once this gets merged).	2015-07-07 16:46:11 -07:00
Dan Albert	5d4b567b7e	Remove a bunch of projects from the NDK manifest. There are still a few more things here that aren't needed, but it isn't entirely clear which they are...	2015-06-25 15:11:53 -07:00
Dan Albert	48bd770972	Remove NDK forks of LLVM projects. We pull these directly from the platform prebuilts now.	2015-06-24 14:50:00 -07:00
Elliott Hughes	08682b5c10	Revert "Remove expat from the master-ndk manifest." This reverts commit `3a05ce6a0d`. Change-Id: Ic683bcd6df96a9f8048cdfe5d1628999093aabf4	2015-06-19 23:57:06 +00:00
Elliott Hughes	3a05ce6a0d	Remove expat from the master-ndk manifest. Bug: http://b/21907643 Change-Id: I18059b9a3914742c049ead972d2491c4ec3615c3	2015-06-19 13:34:58 -07:00
Elliott Hughes	d24bb07752	Add ppl to the manifest. Change-Id: I5ce55ee9ae4457b5c5adb5c7f23916f12e442500	2015-06-19 11:50:55 -07:00
Bill Yi	4dc1d688d0	Manifest for master-ndk Change-Id: I86bd213404c24e54c9539e1d7eff96197b858b57	2015-06-18 16:38:12 -07:00
Jeff Vander Stoep	b5be3a6e17	remove external/checkpolicy and external/libsepol These projects are no longer used and have been replaced by external/selinux. Change-Id: If6dc1e9261f397d801ba2376ab60c5dc5b5d86e4	2015-06-09 17:04:39 +00:00
David Srbecky	26ecb7a152	Revert "Remove external/lzma" LZMA is needed for decompression of debug symbols in libunwind. This reverts commit `8bc0273d91`. Change-Id: Id0622b56f6d682829a2bda6dd2a03e25fbb0fbee	2015-05-18 19:58:50 +00:00
Bill Yi	184c029d91	Remove base gpl files Change-Id: I6b3e3cd4270965e57e4d41e92128adb6927e88cd	2015-05-15 09:07:13 -07:00
Bill Yi	13e5fa0938	Remove obsoleted platform/external/genext2fs Bug: 19282953 Change-Id: I30b6ebbb2f8002f3aaa6cbdca7e05c840da7d380	2015-05-13 10:40:50 -07:00
Bill Yi	af76b2878b	Add device/google/debugcable	2015-05-06 15:32:04 -07:00
Kenny Root	2be481c59d	Switch to BoringSSL DO NOT MERGE Change-Id: I1371dba8384ddab12098231754fbe506096f9906	2015-04-27 13:02:33 -07:00
Bill Yi	b770be5818	Add platform/system/gatekeeper Change-Id: I11b3c8baaef06108aa991d1ffd9d75381f6fee6b	2015-04-27 09:02:53 -07:00
Scott James Remnant	d9a8bc8453	Restore pdk group to system/bt	2015-04-26 08:42:15 -07:00
Scott James Remnant	8c22e4dbb0	Replace platform/external/bluetooth/bluedroid with platform/system/bt Change-Id: I60b22ee9c7493bab0998f4f9541120a5cc80ff98	2015-04-24 10:46:12 -07:00
Nick Kralevich	5e0ba4e69f	add external/selinux to default manifest Build problems were corrected in https://android-review.googlesource.com/147070 Bug: 19963152	2015-04-16 15:31:22 -07:00
Bill Yi	8c6b707579	Add platform/external/sonic	2015-04-09 16:03:09 -07:00
Chad Jones	3008ff711f	Replace repo group on external/squashfs-tools with "pdk"	2015-04-07 20:36:05 -07:00
Mohamad Ayyash	ff51c48b20	Add groups="pdk-cw-fs" for [external/squashfs-tools] This ensures the squashfs includes are available to [system/extras/squashfs_utils] Change-Id: Ia35bfb165b052da44daecf0908d94124b2157bcb	2015-04-07 12:04:33 -07:00
Bill Yi	9642d87e41	Add platform/external/mockftpserver	2015-03-31 14:45:08 -07:00
Bill Yi	187af6ac38	Add platform/external/slf4j	2015-03-31 14:44:53 -07:00
Narayan Kamath	a658524b47	Remove srec / VoiceDialer from the default manifest.	2015-03-20 09:20:08 +00:00
Bill Yi	c732f5d6fe	Add packages/providers/BookmarkProvider BookmarkProvider will be the provider code from the legacy browser, refactored into its own app. It will fill the role of Browser provider when Clank is unavailable (such as on emulation) so we can remove the legacy browser. BUG:19682629	2015-03-16 15:44:45 -07:00
Bill Yi	f402967b08	Manifest update after merging with lollipop-mr1-dev	2015-03-10 15:15:50 -07:00
Bill Yi	7eee764ccc	Add platform/packages/apps/FMRadio	2015-03-10 12:56:05 -07:00
Bill Yi	860e067c5a	Add platform/external/lohit-fonts Change-Id: I951931febae305c8d9ee006e2fea6e2e8cf3b557	2015-03-09 21:17:25 -07:00
Kenny Root	b48f1a97e6	Revert "Revert "Revert "Switch to BoringSSL DO NOT MERGE""" Qualcomm blobs using symbols in OpenSSL that it shouldn't be using. This reverts commit `8c9e4b3cae`. Change-Id: Ifa8a8025525002873888acd6dbadc6aafe722b64	2015-03-09 23:04:59 +00:00
Kenny Root	8c9e4b3cae	Revert "Revert "Switch to BoringSSL DO NOT MERGE"" This reverts commit `d80795d1d3`.	2015-03-09 16:53:56 +00:00
Dan Albert	8112416dc7	Remove external/pixman.	2015-03-06 13:53:04 -08:00
Bill Yi	7399f289a9	Add platform/system/keyguard	2015-03-04 16:58:23 -08:00
Bill Yi	db7ddb2c4d	Add platform/external/libmpeg2	2015-03-04 12:28:57 -08:00
Bill Yi	8bcbd08935	Add platform/external/libavc	2015-03-04 12:28:40 -08:00
Kenny Root	d80795d1d3	Revert "Switch to BoringSSL DO NOT MERGE" This reverts commit `d961564048`. Build broken in win_sdk aosp_x86_64 mac_sdk Change-Id: I6a2b3aa526e070a7f2e1bb314066bfb9624e8a17	2015-03-04 17:04:51 +00:00
Kenny Root	d961564048	Switch to BoringSSL DO NOT MERGE Change-Id: Ide21664148d3e47bbbe06336967d5d69f7ab74a8	2015-03-04 02:23:24 +00:00
Bill Yi	37d163a86a	Add external/squashfs-tools and external/lz4 Change-Id: I77a74074c05ad7443326d6db00699ed9d21a71d7	2015-03-02 15:13:26 -08:00
Stephen Hines	c851b02204	Remove legacy clang prebuilts, and update 3.6 to use appropriate groups. Change-Id: Ie274f4638e6c7727fb235ede57472d22dda3e4a5	2015-02-12 13:37:22 -08:00