From 84e2d198c54099754062710cbfca859831cea689 Mon Sep 17 00:00:00 2001
From: Kuan-Tung Pan <kuantung@google.com>
Date: Thu, 25 Jan 2018 22:41:25 +0000
Subject: DO NOT MERGE ANYWHERE Create manifest for ndk-release-r17

Change-Id: Ia2a7464ecd45eca04af0e9711505de3b55da72bd
BUG: 72450640
---
 default.xml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/default.xml b/default.xml
index c9a92e31a..7f9570934 100644
--- a/default.xml
+++ b/default.xml
@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
-
   <remote  name="aosp"
            fetch=".."
            review="https://android-review.googlesource.com/" />
-  <default revision="master"
+  <default revision="ndk-release-r17"
            remote="aosp"
            sync-j="4" />
-
   <project path="bionic" name="platform/bionic" groups="presubmit" />
   <project path="development" name="platform/development" groups="presubmit" />
   <!-- For lit.py, needed by the libc++ tests. -->
-  <project path="external/libcxx" name="platform/external/libcxx" revision="ndk" />
-  <project path="external/libcxxabi" name="platform/external/libcxxabi" revision="ndk" />
-  <project path="external/libunwind_llvm" name="platform/external/libunwind_llvm" revision="ndk" />
+  <project path="external/libcxx" name="platform/external/libcxx"  />
+  <project path="external/libcxxabi" name="platform/external/libcxxabi"  />
+  <project path="external/libunwind_llvm" name="platform/external/libunwind_llvm"  />
   <project path="external/llvm" name="platform/external/llvm" />
   <project path="external/googletest" name="platform/external/googletest" groups="presubmit" />
-  <project path="external/shaderc/glslang" name="platform/external/shaderc/glslang" revision="master-ndk" groups="presubmit" />
-  <project path="external/shaderc/shaderc" name="platform/external/shaderc/shaderc" revision="master-ndk" groups="presubmit" />
-  <project path="external/shaderc/spirv-headers" name="platform/external/shaderc/spirv-headers" revision="master-ndk" groups="presubmit" />
-  <project path="external/shaderc/spirv-tools" name="platform/external/shaderc/spirv-tools" revision="master-ndk" groups="presubmit" />
+  <project path="external/shaderc/glslang" name="platform/external/shaderc/glslang"  groups="presubmit" />
+  <project path="external/shaderc/shaderc" name="platform/external/shaderc/shaderc"  groups="presubmit" />
+  <project path="external/shaderc/spirv-headers" name="platform/external/shaderc/spirv-headers"  groups="presubmit" />
+  <project path="external/shaderc/spirv-tools" name="platform/external/shaderc/spirv-tools"  groups="presubmit" />
   <project path="external/vulkan-validation-layers" name="platform/external/vulkan-validation-layers" groups="presubmit" />
   <project path="ndk" name="platform/ndk" groups="presubmit" />
   <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" />
@@ -43,7 +41,7 @@
   <project path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" groups="presubmit" />
   <project path="prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/mips/mips64el-linux-android-4.9" groups="presubmit,linux,mips" />
   <project path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" groups="presubmit,linux,x86" />
-  <project path="prebuilts/ndk" name="platform/prebuilts/ndk" revision="dev" groups="presubmit" />
+  <project path="prebuilts/ndk" name="platform/prebuilts/ndk"  groups="presubmit" />
   <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" />
   <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" groups="presubmit" />
   <project path="prebuilts/python/darwin-x86/2.7.5" name="platform/prebuilts/python/darwin-x86/2.7.5" groups="darwin" />
@@ -67,5 +65,4 @@
   <project path="toolchain/sed" name="toolchain/sed" groups="presubmit" />
   <project path="toolchain/xz" name="toolchain/xz" groups="presubmit" />
   <project path="toolchain/yasm" name="toolchain/yasm" groups="presubmit" />
-
 </manifest>
-- 
cgit v1.2.3