Update prebuilts/build-tools from ab/4356965
Adds d8, dx, and desugar to common/. These will be used by
unbundled builds.
Test: m -j TARGET_BUILD_APPS=Gallery2
Change-Id: I0146c62bc29cdb4ba0770198e0735a0a4711809b
diff --git a/common/bin/d8 b/common/bin/d8
new file mode 100755
index 0000000..1c95c0f
--- /dev/null
+++ b/common/bin/d8
@@ -0,0 +1,91 @@
+#!/bin/bash
+#
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+ newProg=`/bin/ls -ld "${prog}"`
+ newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+ if expr "x${newProg}" : 'x/' >/dev/null; then
+ prog="${newProg}"
+ else
+ progdir=`dirname "${prog}"`
+ prog="${progdir}/${newProg}"
+ fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+jarfile=d8.jar
+libdir="$progdir"
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ # set d8.jar location for the SDK case
+ libdir="$libdir/lib"
+fi
+
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ # set d8.jar location for the Android tree case
+ libdir=`dirname "$progdir"`/framework
+fi
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ echo `basename "$prog"`": can't find $jarfile"
+ exit 1
+fi
+
+echo $progdir
+
+# By default, give d8 a max heap size of 1 gig. This can be overridden
+# by using a "-J" option (see below).
+defaultMx="-Xmx1024M"
+
+# The following will extract any initial parameters of the form
+# "-J<stuff>" from the command line and pass them to the Java
+# invocation (instead of to d8). This makes it possible for you to add
+# a command-line parameter such as "-JXmx256M" in your scripts, for
+# example. "java" (with no args) and "java -X" give a summary of
+# available options.
+
+javaOpts=""
+
+while expr "x$1" : 'x-J' >/dev/null; do
+ opt=`expr "x$1" : 'x-J\(.*\)'`
+ javaOpts="${javaOpts} -${opt}"
+ if expr "x${opt}" : "xXmx[0-9]" >/dev/null; then
+ defaultMx="no"
+ fi
+ shift
+done
+
+if [ "${defaultMx}" != "no" ]; then
+ javaOpts="${javaOpts} ${defaultMx}"
+fi
+
+if [ "$OSTYPE" = "cygwin" ]; then
+ # For Cygwin, convert the jarfile path into native Windows style.
+ jarpath=`cygpath -w "$libdir/$jarfile"`
+else
+ jarpath="$libdir/$jarfile"
+fi
+
+exec java $javaOpts -jar "$jarpath" "$@"
diff --git a/common/bin/dx b/common/bin/dx
new file mode 100755
index 0000000..632af43
--- /dev/null
+++ b/common/bin/dx
@@ -0,0 +1,89 @@
+#!/bin/bash
+#
+# Copyright (C) 2007 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+ newProg=`/bin/ls -ld "${prog}"`
+ newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+ if expr "x${newProg}" : 'x/' >/dev/null; then
+ prog="${newProg}"
+ else
+ progdir=`dirname "${prog}"`
+ prog="${progdir}/${newProg}"
+ fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+progdir=`pwd`
+prog="${progdir}"/`basename "${prog}"`
+cd "${oldwd}"
+
+jarfile=dx.jar
+libdir="$progdir"
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ # set dx.jar location for the SDK case
+ libdir="$libdir/lib"
+fi
+
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ # set dx.jar location for the Android tree case
+ libdir=`dirname "$progdir"`/framework
+fi
+
+if [ ! -r "$libdir/$jarfile" ]; then
+ echo `basename "$prog"`": can't find $jarfile"
+ exit 1
+fi
+
+# By default, give dx a max heap size of 1 gig. This can be overridden
+# by using a "-J" option (see below).
+defaultMx="-Xmx1024M"
+
+# The following will extract any initial parameters of the form
+# "-J<stuff>" from the command line and pass them to the Java
+# invocation (instead of to dx). This makes it possible for you to add
+# a command-line parameter such as "-JXmx256M" in your scripts, for
+# example. "java" (with no args) and "java -X" give a summary of
+# available options.
+
+javaOpts=""
+
+while expr "x$1" : 'x-J' >/dev/null; do
+ opt=`expr "x$1" : 'x-J\(.*\)'`
+ javaOpts="${javaOpts} -${opt}"
+ if expr "x${opt}" : "xXmx[0-9]" >/dev/null; then
+ defaultMx="no"
+ fi
+ shift
+done
+
+if [ "${defaultMx}" != "no" ]; then
+ javaOpts="${javaOpts} ${defaultMx}"
+fi
+
+if [ "$OSTYPE" = "cygwin" ]; then
+ # For Cygwin, convert the jarfile path into native Windows style.
+ jarpath=`cygpath -w "$libdir/$jarfile"`
+else
+ jarpath="$libdir/$jarfile"
+fi
+
+exec java $javaOpts -jar "$jarpath" "$@"
diff --git a/common/framework/d8.jar b/common/framework/d8.jar
new file mode 100644
index 0000000..ae39893
--- /dev/null
+++ b/common/framework/d8.jar
Binary files differ
diff --git a/common/framework/desugar.jar b/common/framework/desugar.jar
new file mode 100644
index 0000000..50de8a3
--- /dev/null
+++ b/common/framework/desugar.jar
Binary files differ
diff --git a/common/framework/dx.jar b/common/framework/dx.jar
new file mode 100644
index 0000000..7405a11
--- /dev/null
+++ b/common/framework/dx.jar
Binary files differ
diff --git a/darwin-x86/bin/acp b/darwin-x86/bin/acp
index b151c13..71293c9 100755
--- a/darwin-x86/bin/acp
+++ b/darwin-x86/bin/acp
Binary files differ
diff --git a/darwin-x86/bin/bpfmt b/darwin-x86/bin/bpfmt
index 5248b76..98136c8 100755
--- a/darwin-x86/bin/bpfmt
+++ b/darwin-x86/bin/bpfmt
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index 0eb747d..b20e621 100755
--- a/darwin-x86/bin/ckati
+++ b/darwin-x86/bin/ckati
Binary files differ
diff --git a/darwin-x86/bin/ckati_stamp_dump b/darwin-x86/bin/ckati_stamp_dump
index ef84a18..a473e09 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/header-abi-diff b/darwin-x86/bin/header-abi-diff
index 0bbca67..2064b73 100755
--- a/darwin-x86/bin/header-abi-diff
+++ b/darwin-x86/bin/header-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/header-abi-dumper b/darwin-x86/bin/header-abi-dumper
index cb83c4e..8bb1595 100755
--- a/darwin-x86/bin/header-abi-dumper
+++ b/darwin-x86/bin/header-abi-dumper
Binary files differ
diff --git a/darwin-x86/bin/header-abi-linker b/darwin-x86/bin/header-abi-linker
index b5b5605..77b2d16 100755
--- a/darwin-x86/bin/header-abi-linker
+++ b/darwin-x86/bin/header-abi-linker
Binary files differ
diff --git a/darwin-x86/bin/ijar b/darwin-x86/bin/ijar
deleted file mode 100755
index ff4ca24..0000000
--- a/darwin-x86/bin/ijar
+++ /dev/null
Binary files differ
diff --git a/darwin-x86/bin/makeparallel b/darwin-x86/bin/makeparallel
index a54972d..3968a70 100755
--- a/darwin-x86/bin/makeparallel
+++ b/darwin-x86/bin/makeparallel
Binary files differ
diff --git a/darwin-x86/bin/merge-abi-diff b/darwin-x86/bin/merge-abi-diff
index 164fef1..96751a5 100755
--- a/darwin-x86/bin/merge-abi-diff
+++ b/darwin-x86/bin/merge-abi-diff
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index 404dc0f..816debe 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 9c9077c..8357bcd 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/bin/zip2zip b/darwin-x86/bin/zip2zip
index 01c197d..34a4435 100755
--- a/darwin-x86/bin/zip2zip
+++ b/darwin-x86/bin/zip2zip
Binary files differ
diff --git a/darwin-x86/bin/ziptime b/darwin-x86/bin/ziptime
index f9e83d0..7b047f5 100755
--- a/darwin-x86/bin/ziptime
+++ b/darwin-x86/bin/ziptime
Binary files differ
diff --git a/darwin-x86/lib64/libc++.dylib b/darwin-x86/lib64/libc++.dylib
index 0b19140..989a87b 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libprotobuf-cpp-full.dylib b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
index 7c6ae16..d46d657 100755
--- a/darwin-x86/lib64/libprotobuf-cpp-full.dylib
+++ b/darwin-x86/lib64/libprotobuf-cpp-full.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index 24da1be..eae33aa 100755
--- a/darwin-x86/lib64/libz-host.dylib
+++ b/darwin-x86/lib64/libz-host.dylib
Binary files differ
diff --git a/linux-x86/asan/bin/acp b/linux-x86/asan/bin/acp
index e543fce..ec0ab88 100755
--- a/linux-x86/asan/bin/acp
+++ b/linux-x86/asan/bin/acp
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index 23a598b..2d10aa8 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/ijar b/linux-x86/asan/bin/ijar
deleted file mode 100755
index 61d9895..0000000
--- a/linux-x86/asan/bin/ijar
+++ /dev/null
Binary files differ
diff --git a/linux-x86/asan/bin/makeparallel b/linux-x86/asan/bin/makeparallel
index 07778af..061a898 100755
--- a/linux-x86/asan/bin/makeparallel
+++ b/linux-x86/asan/bin/makeparallel
Binary files differ
diff --git a/linux-x86/asan/bin/ninja b/linux-x86/asan/bin/ninja
index 392d14c..b938a4a 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/asan/bin/ziptime b/linux-x86/asan/bin/ziptime
index 73b7d09..e91bfdd 100755
--- a/linux-x86/asan/bin/ziptime
+++ b/linux-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux-x86/bin/acp b/linux-x86/bin/acp
index 80a0df8..0da16c2 100755
--- a/linux-x86/bin/acp
+++ b/linux-x86/bin/acp
Binary files differ
diff --git a/linux-x86/bin/bpfmt b/linux-x86/bin/bpfmt
index 822ca40..33d72ec 100755
--- a/linux-x86/bin/bpfmt
+++ b/linux-x86/bin/bpfmt
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 631983f..8aef74c 100755
--- a/linux-x86/bin/ckati
+++ b/linux-x86/bin/ckati
Binary files differ
diff --git a/linux-x86/bin/ckati_stamp_dump b/linux-x86/bin/ckati_stamp_dump
index d0856e5..b6b09d8 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/header-abi-diff b/linux-x86/bin/header-abi-diff
index fe6380c..4a860d1 100755
--- a/linux-x86/bin/header-abi-diff
+++ b/linux-x86/bin/header-abi-diff
Binary files differ
diff --git a/linux-x86/bin/header-abi-dumper b/linux-x86/bin/header-abi-dumper
index f22e66e..2a3a640 100755
--- a/linux-x86/bin/header-abi-dumper
+++ b/linux-x86/bin/header-abi-dumper
Binary files differ
diff --git a/linux-x86/bin/header-abi-linker b/linux-x86/bin/header-abi-linker
index c1cc66b..bddd5ad 100755
--- a/linux-x86/bin/header-abi-linker
+++ b/linux-x86/bin/header-abi-linker
Binary files differ
diff --git a/linux-x86/bin/ijar b/linux-x86/bin/ijar
deleted file mode 100755
index 6012e6c..0000000
--- a/linux-x86/bin/ijar
+++ /dev/null
Binary files differ
diff --git a/linux-x86/bin/makeparallel b/linux-x86/bin/makeparallel
index 3dc6aa8..0f8e691 100755
--- a/linux-x86/bin/makeparallel
+++ b/linux-x86/bin/makeparallel
Binary files differ
diff --git a/linux-x86/bin/merge-abi-diff b/linux-x86/bin/merge-abi-diff
index 3f0a1d2..da2d83a 100755
--- a/linux-x86/bin/merge-abi-diff
+++ b/linux-x86/bin/merge-abi-diff
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 64e6ad7..770ac7d 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index fe7057f..5c4b0be 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/zip2zip b/linux-x86/bin/zip2zip
index 2bc1c50..e83393d 100755
--- a/linux-x86/bin/zip2zip
+++ b/linux-x86/bin/zip2zip
Binary files differ
diff --git a/linux-x86/bin/ziptime b/linux-x86/bin/ziptime
index 18970ab..fb30e5f 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index 87bf4f9..f97dcb0 100755
--- a/linux-x86/lib64/libprotobuf-cpp-full.so
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index 19b272b..20ae0cb 100755
--- a/linux-x86/lib64/libz-host.so
+++ b/linux-x86/lib64/libz-host.so
Binary files differ
diff --git a/manifest.xml b/manifest.xml
index d622591..9510428 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,42 +3,50 @@
<remote fetch=".." name="aosp" review="https://android-review.googlesource.com/" />
<default remote="aosp" revision="master" sync-j="4" />
<!-- build projects -->
- <project name="platform/build" path="build/make" revision="70fe80491c404803e4dd2ef293c6a2afa1411206" upstream="master">
+ <project name="platform/build" path="build/make" revision="b463cdc874ee824063e010a21928b879d5a0be1b" upstream="master">
<linkfile dest="build/tools" src="tools" />
</project>
- <project name="platform/build/blueprint" path="build/blueprint" revision="4d83bc154168c9bf379b149b97e30ee5c563a1b3" upstream="master" />
- <project name="platform/build/kati" path="build/kati" revision="ac81d0af5c7f55483a1e2a87d59c42bd6206e7ff" upstream="master" />
- <project name="platform/build/soong" path="build/soong" revision="1c508b6c53c14a6e580ed93c124250c599f2abfc" upstream="master">
+ <project name="platform/build/blueprint" path="build/blueprint" revision="ac45bd1ea824a274d9347f3d01671d959065ac15" upstream="master" />
+ <project name="platform/build/kati" path="build/kati" revision="d18d5bb2122043a37570d8fcaf2f212ec505ff3f" upstream="master" />
+ <project name="platform/build/soong" path="build/soong" revision="968df27a9cc09828c38efacec7e86bdf31f06faf" upstream="master">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
</project>
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="36b23596fd6d82079ecc2e389be3147205d1ace9" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="14cd25f51eb15f089d7383e75780141fc203dd86" upstream="master" />
<!-- toolchain linux prebuilts -->
- <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="1050067936dffa13d6aa30a8c1479444c620ef2d" upstream="master" />
- <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="9ee4f51e97bc4bc8f51b06912767018be4d65853" upstream="master" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="bad563e7e4a7e9990e46dd22487dc6ee070e9023" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="b46f318d304e555302a43bc1d72a76e9de664137" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" revision="6e91bb7b816df8543cffe14287acbf0412f65550" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="cc0b9f5238fed2fb3b3a0dfa9cd1dd163b053a8c" upstream="master" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" upstream="master" />
<!-- toolchain darwin prebuilts -->
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="c052e7853ea000b972d163d1774a44516b8814a6" upstream="master" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="79ab35821f15a799850480a9263411d44b4f7967" upstream="master" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" upstream="master" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" revision="ec5aa66aaa4964c27564d0ec84dc1f18a2d72b7e" upstream="master" />
- <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="214ca0da84572946408b1604851d621712e953cc" upstream="master" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="1336ba94c3bda2b2db8d6eab54036ae88423be55" upstream="master" />
<project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" upstream="master" />
<!-- toolchain windows prebuilts -->
<project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="696baf341dce8cc784a09988ca3b2c961f31ea55" upstream="master" />
- <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="d3566f4f19b660d98ff237825ed775289c102420" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8" revision="e76a9a506d7ad132f107eb2f7c27b6a8ccb68b91" upstream="master" />
+ <!-- toolchain jdk prebuilts -->
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="d49ad92452c3ec4b859283f36372a3d12ad7a4ea" upstream="master" />
+ <!-- dependency prebuilts -->
+ <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="062009ffd95b0eb78fa0e75067390a00e042e730" upstream="master" />
<!-- dependency source -->
- <project name="platform/development" path="development" revision="246dec11e15d958abb956a81241eafcddfbeaaf9" upstream="master" />
- <project name="platform/external/clang" path="external/clang" revision="2ac8d40a031fefd2e04900a4f27bb9360672c184" upstream="master" />
- <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="8bdaf98eeb4dd0f7b8cae390cd18c097a9eb4e2f" upstream="master" />
- <project name="platform/external/libcxx" path="external/libcxx" revision="0aea6aeca494754446dd1e5fe638fe68da128036" upstream="master" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="c41479a1d7de7fe6e9cfbff9be21382f7b23ace7" upstream="master" />
- <project name="platform/external/libunwind" path="external/libunwind" revision="332513d0d27d0f9bc798c9d7bd91944be1f0b20f" upstream="master" />
- <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="93d99bf31d081198030380a946f4c29e38159b25" upstream="master" />
- <project name="platform/external/llvm" path="external/llvm" revision="a3d0bb71592a299ec4cc8699bf09e5ecdc7236e2" upstream="master" />
- <project name="platform/external/protobuf" path="external/protobuf" revision="7fca48d8ce97f7ba3ab8eea5c472f1ad3711762f" upstream="master" />
- <project name="platform/external/zlib" path="external/zlib" revision="30595680d975bf98dd62e3c25d16562ab33c3d4d" upstream="master" />
+ <project name="platform/development" path="development" revision="85578a85155eb49ee13c408f3041d56846315e9c" upstream="master" />
+ <project name="platform/external/clang" path="external/clang" revision="e13eb9ee1f044f16942af36137a4c762d71465e7" upstream="master" />
+ <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="b1057501feea183e879f8b7ee36ba67ef3ebe5dd" upstream="master" />
+ <project name="platform/external/dagger2" path="external/dagger2" revision="30909f76ef2849d6e048344b5f57588139acb181" upstream="master" />
+ <project name="platform/external/libcxx" path="external/libcxx" revision="0f0034c24d0bfe64fe65c84d65f0ea03be5c726a" upstream="master" />
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="bb0e188762f569942766f8f25c9d38448c48cf9b" upstream="master" />
+ <project name="platform/external/libunwind" path="external/libunwind" revision="98996149c95c9f6fca5c2589f4664ec1a394439d" upstream="master" />
+ <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="fb49aba884e8571d36ed55e0d70d41a0447387c6" upstream="master" />
+ <project name="platform/external/llvm" path="external/llvm" revision="b95aeef86e46ce32b198ac1e4bae4e842aa028e8" upstream="master" />
+ <project name="platform/external/protobuf" path="external/protobuf" revision="da30efac8863fdda3cefb9eff987fe5f710a8ec8" upstream="master" />
+ <project name="platform/external/zlib" path="external/zlib" revision="0902bb9d09bcd155750b0e1cd6cad7dd1b3b1042" upstream="master" />
<!-- target projects -->
- <project name="toolchain/go" path="toolchain/go" revision="400c8bc4d528a27d1a1e2898e641961510f4d012" upstream="master" />
+ <project name="toolchain/go" path="toolchain/go" revision="fea2d2393bd3da68879fa4eabd8ef663f222d037" upstream="master" />
+ <project name="platform/dalvik" path="dalvik" revision="395c9e9c1b6f367c80c6203ed6f22a65c6586a7e" upstream="master" />
+ <project name="platform/external/desugar" path="external/desugar" revision="8c363aa283feeacaafe0f21418952a49f00684ff" upstream="master" />
<project name="platform/external/ninja" path="external/ninja" revision="101d7631c770e0cce6ac779a4a865420bffb6987" upstream="master" />
+ <project name="platform/external/r8" path="external/r8" revision="357ae118cbc9ee01052097fae998e875fec9cad0" upstream="master" />
</manifest>
