Merge "Add mv(1) symlink."
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 4d03372..18d55fb 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -74,6 +74,7 @@
)
if [[ $OS == "linux" ]]; then
SOONG_BINARIES+=(
+ nsjail
toybox
)
SOONG_ASAN_BINARIES+=(
diff --git a/common/framework/dx.jar b/common/framework/dx.jar
index 207956d..0e0aec0 100644
--- a/common/framework/dx.jar
+++ b/common/framework/dx.jar
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 0052fa7..2eaec3c 100755
--- a/darwin-x86/bin/aidl
+++ b/darwin-x86/bin/aidl
Binary files differ
diff --git a/darwin-x86/bin/bison b/darwin-x86/bin/bison
index 27c00b7..e2b4ecf 100755
--- a/darwin-x86/bin/bison
+++ b/darwin-x86/bin/bison
Binary files differ
diff --git a/darwin-x86/bin/ckati b/darwin-x86/bin/ckati
index 6ef625f..27064ab 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 3a44a27..d6fcfda 100755
--- a/darwin-x86/bin/ckati_stamp_dump
+++ b/darwin-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/darwin-x86/bin/flex b/darwin-x86/bin/flex
index 46a7df0..76b6711 100755
--- a/darwin-x86/bin/flex
+++ b/darwin-x86/bin/flex
Binary files differ
diff --git a/darwin-x86/bin/make b/darwin-x86/bin/make
index 9af4bc2..de82560 100755
--- a/darwin-x86/bin/make
+++ b/darwin-x86/bin/make
Binary files differ
diff --git a/darwin-x86/bin/makeparallel b/darwin-x86/bin/makeparallel
index 5044a16..7318b06 100755
--- a/darwin-x86/bin/makeparallel
+++ b/darwin-x86/bin/makeparallel
Binary files differ
diff --git a/darwin-x86/bin/ninja b/darwin-x86/bin/ninja
index b963f56..353b9cf 100755
--- a/darwin-x86/bin/ninja
+++ b/darwin-x86/bin/ninja
Binary files differ
diff --git a/darwin-x86/bin/one-true-awk b/darwin-x86/bin/one-true-awk
new file mode 100755
index 0000000..369312f
--- /dev/null
+++ b/darwin-x86/bin/one-true-awk
Binary files differ
diff --git a/darwin-x86/bin/soong_zip b/darwin-x86/bin/soong_zip
index 4b0d570..0e395cd 100755
--- a/darwin-x86/bin/soong_zip
+++ b/darwin-x86/bin/soong_zip
Binary files differ
diff --git a/darwin-x86/bin/xz b/darwin-x86/bin/xz
index d5f2fcc..88f2e7a 100755
--- a/darwin-x86/bin/xz
+++ b/darwin-x86/bin/xz
Binary files differ
diff --git a/darwin-x86/bin/zipalign b/darwin-x86/bin/zipalign
index 4a6b729..c0b4f4a 100755
--- a/darwin-x86/bin/zipalign
+++ b/darwin-x86/bin/zipalign
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index 8ad8982..d88e515 100755
--- a/darwin-x86/lib64/libbase.dylib
+++ b/darwin-x86/lib64/libbase.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libc++.dylib b/darwin-x86/lib64/libc++.dylib
index 6a20faf..fef05e7 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
index 79bdf78..4b35c8e 100755
--- a/darwin-x86/lib64/liblog.dylib
+++ b/darwin-x86/lib64/liblog.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libz-host.dylib b/darwin-x86/lib64/libz-host.dylib
index 3bb748c..a561af3 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 cdfafb0..e15af1d 100755
--- a/linux-x86/asan/bin/acp
+++ b/linux-x86/asan/bin/acp
Binary files differ
diff --git a/linux-x86/asan/bin/aidl b/linux-x86/asan/bin/aidl
index c9543b1..ebdfa89 100755
--- a/linux-x86/asan/bin/aidl
+++ b/linux-x86/asan/bin/aidl
Binary files differ
diff --git a/linux-x86/asan/bin/ckati b/linux-x86/asan/bin/ckati
index 4a262b9..8422a2b 100755
--- a/linux-x86/asan/bin/ckati
+++ b/linux-x86/asan/bin/ckati
Binary files differ
diff --git a/linux-x86/asan/bin/makeparallel b/linux-x86/asan/bin/makeparallel
index 918b815..54068b2 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 9212ea9..5a013a6 100755
--- a/linux-x86/asan/bin/ninja
+++ b/linux-x86/asan/bin/ninja
Binary files differ
diff --git a/linux-x86/asan/bin/toybox b/linux-x86/asan/bin/toybox
index 0743eae..bbb73f2 100755
--- a/linux-x86/asan/bin/toybox
+++ b/linux-x86/asan/bin/toybox
Binary files differ
diff --git a/linux-x86/asan/bin/zipalign b/linux-x86/asan/bin/zipalign
index c34bc11..397dba1 100755
--- a/linux-x86/asan/bin/zipalign
+++ b/linux-x86/asan/bin/zipalign
Binary files differ
diff --git a/linux-x86/asan/bin/ziptime b/linux-x86/asan/bin/ziptime
index e02a9f9..281fed8 100755
--- a/linux-x86/asan/bin/ziptime
+++ b/linux-x86/asan/bin/ziptime
Binary files differ
diff --git a/linux-x86/asan/lib64/libbase.so b/linux-x86/asan/lib64/libbase.so
index 0a02c89..76ef02f 100755
--- a/linux-x86/asan/lib64/libbase.so
+++ b/linux-x86/asan/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libc++.so b/linux-x86/asan/lib64/libc++.so
index d5b17d6..b9593a6 100755
--- a/linux-x86/asan/lib64/libc++.so
+++ b/linux-x86/asan/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libcrypto-host.so b/linux-x86/asan/lib64/libcrypto-host.so
index 89dab33..746b155 100755
--- a/linux-x86/asan/lib64/libcrypto-host.so
+++ b/linux-x86/asan/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libcutils.so b/linux-x86/asan/lib64/libcutils.so
index 474d556..44cc590 100755
--- a/linux-x86/asan/lib64/libcutils.so
+++ b/linux-x86/asan/lib64/libcutils.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libjemalloc.so b/linux-x86/asan/lib64/libjemalloc.so
index 1034cbc..35856eb 100755
--- a/linux-x86/asan/lib64/libjemalloc.so
+++ b/linux-x86/asan/lib64/libjemalloc.so
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index 88987e8..2615ff8 100755
--- a/linux-x86/asan/lib64/liblog.so
+++ b/linux-x86/asan/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libpcre2.so b/linux-x86/asan/lib64/libpcre2.so
index 5c51458..b3dbd2c 100755
--- a/linux-x86/asan/lib64/libpcre2.so
+++ b/linux-x86/asan/lib64/libpcre2.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libselinux.so b/linux-x86/asan/lib64/libselinux.so
index f4cce5f..09b491e 100755
--- a/linux-x86/asan/lib64/libselinux.so
+++ b/linux-x86/asan/lib64/libselinux.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libz-host.so b/linux-x86/asan/lib64/libz-host.so
index 6f03fb3..bc4c703 100755
--- a/linux-x86/asan/lib64/libz-host.so
+++ b/linux-x86/asan/lib64/libz-host.so
Binary files differ
diff --git a/linux-x86/bin/acp b/linux-x86/bin/acp
index 492bdd3..1465d7d 100755
--- a/linux-x86/bin/acp
+++ b/linux-x86/bin/acp
Binary files differ
diff --git a/linux-x86/bin/aidl b/linux-x86/bin/aidl
index 4748042..fdc28d3 100755
--- a/linux-x86/bin/aidl
+++ b/linux-x86/bin/aidl
Binary files differ
diff --git a/linux-x86/bin/bison b/linux-x86/bin/bison
index 626c90f..73a46cf 100755
--- a/linux-x86/bin/bison
+++ b/linux-x86/bin/bison
Binary files differ
diff --git a/linux-x86/bin/ckati b/linux-x86/bin/ckati
index 0f80dcb..0c7305d 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 f5085de..f6698bf 100755
--- a/linux-x86/bin/ckati_stamp_dump
+++ b/linux-x86/bin/ckati_stamp_dump
Binary files differ
diff --git a/linux-x86/bin/flex b/linux-x86/bin/flex
index e3f55f1..40c91bc 100755
--- a/linux-x86/bin/flex
+++ b/linux-x86/bin/flex
Binary files differ
diff --git a/linux-x86/bin/make b/linux-x86/bin/make
index 90dcde4..68b5eb6 100755
--- a/linux-x86/bin/make
+++ b/linux-x86/bin/make
Binary files differ
diff --git a/linux-x86/bin/makeparallel b/linux-x86/bin/makeparallel
index 3c668bd..d6870f2 100755
--- a/linux-x86/bin/makeparallel
+++ b/linux-x86/bin/makeparallel
Binary files differ
diff --git a/linux-x86/bin/ninja b/linux-x86/bin/ninja
index 7c3cacb..814221f 100755
--- a/linux-x86/bin/ninja
+++ b/linux-x86/bin/ninja
Binary files differ
diff --git a/linux-x86/bin/nsjail b/linux-x86/bin/nsjail
new file mode 100755
index 0000000..b9f317c
--- /dev/null
+++ b/linux-x86/bin/nsjail
Binary files differ
diff --git a/linux-x86/bin/one-true-awk b/linux-x86/bin/one-true-awk
new file mode 100755
index 0000000..06119eb
--- /dev/null
+++ b/linux-x86/bin/one-true-awk
Binary files differ
diff --git a/linux-x86/bin/soong_zip b/linux-x86/bin/soong_zip
index 9787d8f..3c292c1 100755
--- a/linux-x86/bin/soong_zip
+++ b/linux-x86/bin/soong_zip
Binary files differ
diff --git a/linux-x86/bin/toybox b/linux-x86/bin/toybox
index 1b9df54..314d37e 100755
--- a/linux-x86/bin/toybox
+++ b/linux-x86/bin/toybox
Binary files differ
diff --git a/linux-x86/bin/xz b/linux-x86/bin/xz
index 81888ae..48039b9 100755
--- a/linux-x86/bin/xz
+++ b/linux-x86/bin/xz
Binary files differ
diff --git a/linux-x86/bin/zipalign b/linux-x86/bin/zipalign
index 388ea9b..413065e 100755
--- a/linux-x86/bin/zipalign
+++ b/linux-x86/bin/zipalign
Binary files differ
diff --git a/linux-x86/bin/ziptime b/linux-x86/bin/ziptime
index e0132ca..efc144c 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index 2b1f28c..bf5842d 100755
--- a/linux-x86/lib64/libbase.so
+++ b/linux-x86/lib64/libbase.so
Binary files differ
diff --git a/linux-x86/lib64/libc++.so b/linux-x86/lib64/libc++.so
index 31e8004..fde62fe 100755
--- a/linux-x86/lib64/libc++.so
+++ b/linux-x86/lib64/libc++.so
Binary files differ
diff --git a/linux-x86/lib64/libcrypto-host.so b/linux-x86/lib64/libcrypto-host.so
index 34e6db4..8b6f4e9 100755
--- a/linux-x86/lib64/libcrypto-host.so
+++ b/linux-x86/lib64/libcrypto-host.so
Binary files differ
diff --git a/linux-x86/lib64/libcutils.so b/linux-x86/lib64/libcutils.so
index 3d2ee00..94f1021 100755
--- a/linux-x86/lib64/libcutils.so
+++ b/linux-x86/lib64/libcutils.so
Binary files differ
diff --git a/linux-x86/lib64/libjemalloc.so b/linux-x86/lib64/libjemalloc.so
index 6110743..e99fd42 100755
--- a/linux-x86/lib64/libjemalloc.so
+++ b/linux-x86/lib64/libjemalloc.so
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index f53e59d..a196ce0 100755
--- a/linux-x86/lib64/liblog.so
+++ b/linux-x86/lib64/liblog.so
Binary files differ
diff --git a/linux-x86/lib64/libpcre2.so b/linux-x86/lib64/libpcre2.so
index a34e288..b5e938c 100755
--- a/linux-x86/lib64/libpcre2.so
+++ b/linux-x86/lib64/libpcre2.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
new file mode 100755
index 0000000..00489f4
--- /dev/null
+++ b/linux-x86/lib64/libprotobuf-cpp-full.so
Binary files differ
diff --git a/linux-x86/lib64/libselinux.so b/linux-x86/lib64/libselinux.so
index 521a817..3af4f47 100755
--- a/linux-x86/lib64/libselinux.so
+++ b/linux-x86/lib64/libselinux.so
Binary files differ
diff --git a/linux-x86/lib64/libz-host.so b/linux-x86/lib64/libz-host.so
index c91c111..2e06ceb 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 9a212aa..83c4142 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,72 +3,73 @@
<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="159eb0938b3de4a6a4192dbb4ab192152234116c" upstream="master">
+ <project name="platform/build" path="build/make" revision="b26319ca38cba7d69131ec2c942e1beeb31078fc" upstream="master">
<linkfile dest="build/tools" src="tools" />
- </project>
- <project name="platform/build/blueprint" path="build/blueprint" revision="b19ead4ea0f9beb50141d036d6b7833235a91e0b" upstream="master" />
- <project name="platform/build/soong" path="build/soong" revision="328b077e20483ec5eeb59c540c2d58d8c9a4c46e" upstream="master">
+</project>
+ <project name="platform/build/blueprint" path="build/blueprint" revision="d2079417c165546d8146a763518404943652b8ca" upstream="master" />
+ <project name="platform/build/soong" path="build/soong" revision="84af3624bb7af32ee2482952952aef08c410f70d" upstream="master">
<linkfile dest="Android.bp" src="root.bp" />
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
- </project>
+</project>
<project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="ad5c1b9ef69897a3ce3d9239e2e0c0ed22ac5fcd" upstream="master" />
- <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="82d6d0179dc9c96b2de8345262fa26d6797c71cf" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="a1e767633986e36d71a3ccbb4a333ab5c88d8f8b" 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="b6ab2f41a7fcddea2835d89dbdc9a646bb398055" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="5a593bbd37f1beaf4a4e3a5566188be8d8310f61" 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="5a7800f07447759cb2ce5d529d71e2eff6e6359a" upstream="master" />
<project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" path="prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9" revision="df26981b1d00d4dd0cf35ed1d96344cf1dfb05b5" upstream="master" />
<project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="394b8054fe2c7c143d15dd3236159971402b5a21" 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="d59e393e512795383ddb8bde49df55782cc22e0c" upstream="master" />
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="6dc8b43beb9a6409115b6e188231fb19c4d2ddd6" 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="28437c29d829b8c753e7128090faf134181fdf19" 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="bcd9518a40e55efff1f56cbb47e2e51ae3fe4170" 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="5529a705de82daca387d98c761ea08a5597d68fc" upstream="master" />
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="43110ff2be613bc9e1aecfba28748ae499e58b49" 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="e64376b5c37d65e863a8057786142c1db6e9d3e7" upstream="master" />
<!-- toolchain jdk prebuilts -->
- <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="13f5a7554ae77bf3cd959445646ecb485a670d3a" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="aaa1e4d6fea9f97b32fe1bd97615b65b1c661f6e" upstream="master" />
<project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="60eae91c05b7e653029024fbd37f7994afcb4288" upstream="master" />
<!-- dependency prebuilts -->
- <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="b520feb92e5268cecac7352ded67b18fe91ebf16" upstream="master" />
+ <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="1499e29799182bcd453969dbd71fb45decd7b3a9" upstream="master" />
<!-- dependency source -->
- <project name="platform/bionic" path="bionic" revision="7f92fbe06484f036274952efa00fb5cdf410eb12" upstream="master" />
- <project name="platform/development" path="development" revision="4065033167111e075375f1f7120491b0f5af9d7f" upstream="master" />
- <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="a17312417be0fc9565314eb715b29e5080e986f5" upstream="master" />
- <project name="platform/external/boringssl" path="external/boringssl" revision="c9abfe422b3e387555f922dfcc280299b6e92975" upstream="master" />
+ <project name="platform/bionic" path="bionic" revision="2242cca714786c1eddee6fe6a9c48142128da3c1" upstream="master" />
+ <project name="platform/development" path="development" revision="e3a587ee82ab21b77b070b63571a134d8136dceb" upstream="master" />
+ <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="4ced35fcfcda5baddd092390103b7370827b9429" upstream="master" />
+ <project name="platform/external/boringssl" path="external/boringssl" revision="11c28bd346323429220e1d3de42163868d83d0cd" upstream="master" />
<project name="platform/external/clang" path="external/clang" revision="32290d3463d1ca9037fc8a1f3aa15129c46f3567" upstream="master" />
- <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="2d424e65079e09cc8ea5b98b6cda49014226a2f2" upstream="master" />
+ <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="d9d4fe0f3eecdee619433e3ad4ff24bd1f0d0cdc" upstream="master" />
<project name="platform/external/dagger2" path="external/dagger2" revision="e163fb460c9568db361e8dba6ce724fefeda99c9" upstream="master" />
- <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="457da02d2352b40f168431191ee5ac8cf6d66533" upstream="master" />
- <project name="platform/external/googletest" path="external/googletest" revision="29461112ba261539c7342c8481e5037c55079479" upstream="master" />
- <project name="platform/external/jemalloc" path="external/jemalloc" revision="bb10eec3d268fa2254afbda4624d8d7859048acf" upstream="master" />
- <project name="platform/external/libcxx" path="external/libcxx" revision="20fc59039169e97ffad8763492457a385bd47a8b" upstream="master" />
- <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="4957d0c49893f69fb8a80f63257e7e0e417b9207" upstream="master" />
- <project name="platform/external/libunwind" path="external/libunwind" revision="8ba86320a71bcdc7b411070c0c0f101cf2131cf2" upstream="master" />
+ <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="2e2c823b3112c5f9384d6f8194f115195ef99b11" upstream="master" />
+ <project name="platform/external/googletest" path="external/googletest" revision="511a7d7cc060fba303f377d7100ec8f5cbe817c8" upstream="master" />
+ <project name="platform/external/jemalloc" path="external/jemalloc" revision="2ba585c129edcaf0b05e1934b316878e1f3307aa" upstream="master" />
+ <project name="platform/external/libcxx" path="external/libcxx" revision="5ca76f3cd285f04bc35de4998bd308493fd5ea1d" upstream="master" />
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="1389a8dc482d10684a7b30d0aa4c9c58155113ed" upstream="master" />
+ <project name="platform/external/libunwind" path="external/libunwind" revision="2cda02158017f406a7f3f3e09e51a6349186cb44" upstream="master" />
<project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="6611fedd1a568d258ee28b715d2b4f46854f037c" upstream="master" />
- <project name="platform/external/llvm" path="external/llvm" revision="051915de205532bf2fea744406427b23be180604" upstream="master" />
- <project name="platform/external/pcre" path="external/pcre" revision="289c6169f5307a2063669129772d7fed0e5b0f8b" upstream="master" />
- <project name="platform/external/protobuf" path="external/protobuf" revision="0dac9ed696ff64f707c59abf77cafbe4de9c539a" upstream="master" />
- <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="d5c9ae2bd6d1f226dee3882322dcd6513cb2a185" upstream="master" />
- <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="f9ba8827cceb96f23795816a7575da2b0bc85dd9" upstream="master" />
+ <project name="platform/external/llvm" path="external/llvm" revision="c06f72f41a0d3e0b5116971e2cb770384df6ac37" upstream="master" />
+ <project name="platform/external/pcre" path="external/pcre" revision="3b872d4d8bf8fb771acd0182e9e0713b2e58595f" upstream="master" />
+ <project name="platform/external/protobuf" path="external/protobuf" revision="67d651e773780da5906e77040a3e18a0513e2329" upstream="master" />
+ <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="dbcebe04a0fb6f548d0d1481359cf4e380854698" upstream="master" />
+ <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="01ec99604274ff5e9e35329ac38fb15a59da83d8" upstream="master" />
<project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" upstream="master" />
- <project name="platform/external/selinux" path="external/selinux" revision="b744f16fd2626c87778927566297be51e6a3b329" upstream="master" />
- <project name="platform/external/zlib" path="external/zlib" revision="ca1678799a04b3832c04f96b9930f5a00c92cfe3" upstream="master" />
- <project name="platform/external/zopfli" path="external/zopfli" revision="4101d743cef9e1161bfc9ed4d3c8d4910c6346f7" upstream="master" />
- <project name="platform/system/core" path="system/core" revision="ee9d6382d13411614c27b25de8c97273f066a8d3" upstream="master" />
+ <project name="platform/external/selinux" path="external/selinux" revision="5fa62dd3182c6f6350b559017480b441f289b78c" upstream="master" />
+ <project name="platform/external/zlib" path="external/zlib" revision="a3cf22db365472979bc34f54934114b5c1a8c8d7" upstream="master" />
+ <project name="platform/external/zopfli" path="external/zopfli" revision="ae7a7d47375836ccc3b442bea7f30b31e7853d43" upstream="master" />
+ <project name="platform/system/core" path="system/core" revision="e5f61a9bcd5e92c611255e11d8a80968e47d7dfb" upstream="master" />
<!-- target projects -->
- <project name="platform/build/kati" path="build/kati" revision="667d0786cf22c10131611f2f1d030224082662d8" upstream="master" />
- <project name="platform/dalvik" path="dalvik" revision="906f0f6c078316281f64f20a4da3209b79468ed7" upstream="master" />
+ <project name="platform/build/kati" path="build/kati" revision="6a9485557803a5f8637e02a520456f48636fe3bf" upstream="master" />
+ <project name="platform/dalvik" path="dalvik" revision="a1b87e9f3af5b377f7313754bae7e7df14a46ee9" upstream="master" />
<project name="platform/external/bison" path="external/bison" revision="a8ab20ff88a9b962a8eb39cdb6944a2354f78748" upstream="master" />
<project name="platform/external/desugar" path="external/desugar" revision="1b8781e72f7e038dcfaac925588d90c4f29ee28d" upstream="master" />
<project name="platform/external/flex" path="external/flex" revision="94457957c9e112dc635612b6e4fc2a64222fa995" upstream="master" />
- <project name="platform/external/ninja" path="external/ninja" revision="4e736523f62d637f6cefb759a4a29b9b83e5b313" upstream="master" />
- <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="17e512b12413a5f9fd01e0c16937de797cb10340" upstream="master" />
- <project name="platform/external/toybox" path="external/toybox" revision="37f8ff38fde674b38676688b9a0933c7a7c6dd6e" upstream="master" />
+ <project name="platform/external/ninja" path="external/ninja" revision="ab90ee43f8b0052c1bd5ed549d04b8c242e4f5af" upstream="master" />
+ <project name="platform/external/nsjail" path="external/nsjail" revision="3de13eeda716244ac196b5a501f98c98bc3947d0" upstream="master" />
+ <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="ff0b4402c160545951cd58e150e25447b975ab47" upstream="master" />
+ <project name="platform/external/toybox" path="external/toybox" revision="73a2fe2f78af20859d22da89faaa3e27fec5a178" upstream="master" />
<project name="platform/external/turbine" path="external/turbine" revision="18281a601c7e534c4684a5dbf7e6c6ba799d1177" upstream="master" />
- <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="640981b1d082f597b894d781d81f4294e72815e0" upstream="master" />
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="cfc85f41338e7bf32f97bce25a50872051ed5567" upstream="master" />
<project name="toolchain/go" revision="790cd13b5a1ebd944f7b1e707bc664e5a1d1d38d" upstream="master" />
<project name="toolchain/m4" revision="cfddd4f332465a447e87b4c1523fb2b9133e7afd" upstream="master" />
<project name="toolchain/make" revision="13854caa2e8addb6dad174944e62a9ef6378e3f2" upstream="master" />
diff --git a/toybox/linux-x86/chmod b/toybox/linux-x86/chmod
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/chmod
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/du b/toybox/linux-x86/du
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/du
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/echo b/toybox/linux-x86/echo
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/echo
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/expr b/toybox/linux-x86/expr
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/expr
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/getconf b/toybox/linux-x86/getconf
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/getconf
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/ln b/toybox/linux-x86/ln
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/ln
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/ls b/toybox/linux-x86/ls
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/ls
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/mktemp b/toybox/linux-x86/mktemp
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/mktemp
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/readlink b/toybox/linux-x86/readlink
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/readlink
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/rm b/toybox/linux-x86/rm
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/rm
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/sort b/toybox/linux-x86/sort
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/sort
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/stat b/toybox/linux-x86/stat
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/stat
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
diff --git a/toybox/linux-x86/xargs b/toybox/linux-x86/xargs
new file mode 120000
index 0000000..c6b4b1f
--- /dev/null
+++ b/toybox/linux-x86/xargs
@@ -0,0 +1 @@
+../../linux-x86/bin/toybox
\ No newline at end of file
