DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I9fc929b121a598c22d767d9ec3dec635214e7308
diff --git a/build-prebuilts.sh b/build-prebuilts.sh
index 18d55fb..9da76c3 100755
--- a/build-prebuilts.sh
+++ b/build-prebuilts.sh
@@ -49,6 +49,7 @@
make
makeparallel
ninja
+ py2-cmd
soong_zip
xz
zip2zip
diff --git a/common/framework/turbine.jar b/common/framework/turbine.jar
index a899bd1..5801c58 100644
--- a/common/framework/turbine.jar
+++ b/common/framework/turbine.jar
Binary files differ
diff --git a/darwin-x86/bin/acp b/darwin-x86/bin/acp
index c26ac17..a089d3f 100755
--- a/darwin-x86/bin/acp
+++ b/darwin-x86/bin/acp
Binary files differ
diff --git a/darwin-x86/bin/aidl b/darwin-x86/bin/aidl
index 2eaec3c..e9091c4 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 e2b4ecf..d5e0568 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 27064ab..9f237ef 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 d6fcfda..5151d92 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 76b6711..aeee221 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 de82560..089fcb1 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 7318b06..92ba9a6 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 353b9cf..65f1645 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
index 369312f..a201a93 100755
--- a/darwin-x86/bin/one-true-awk
+++ b/darwin-x86/bin/one-true-awk
Binary files differ
diff --git a/darwin-x86/bin/py2-cmd b/darwin-x86/bin/py2-cmd
new file mode 100755
index 0000000..664759c
--- /dev/null
+++ b/darwin-x86/bin/py2-cmd
Binary files differ
diff --git a/darwin-x86/bin/xz b/darwin-x86/bin/xz
index 88f2e7a..d8acdaa 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 c0b4f4a..0ddfd3e 100755
--- a/darwin-x86/bin/zipalign
+++ b/darwin-x86/bin/zipalign
Binary files differ
diff --git a/darwin-x86/bin/ziptime b/darwin-x86/bin/ziptime
index 71936fd..7f2a75b 100755
--- a/darwin-x86/bin/ziptime
+++ b/darwin-x86/bin/ziptime
Binary files differ
diff --git a/darwin-x86/lib64/libandroidicu-host.dylib b/darwin-x86/lib64/libandroidicu-host.dylib
new file mode 100755
index 0000000..d1c1d33
--- /dev/null
+++ b/darwin-x86/lib64/libandroidicu-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libbase.dylib b/darwin-x86/lib64/libbase.dylib
index d88e515..4969875 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 fef05e7..209dbaa 100755
--- a/darwin-x86/lib64/libc++.dylib
+++ b/darwin-x86/lib64/libc++.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libcrypto-host.dylib b/darwin-x86/lib64/libcrypto-host.dylib
new file mode 100755
index 0000000..53fbdb8
--- /dev/null
+++ b/darwin-x86/lib64/libcrypto-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libicui18n-host.dylib b/darwin-x86/lib64/libicui18n-host.dylib
new file mode 100755
index 0000000..863eb5d
--- /dev/null
+++ b/darwin-x86/lib64/libicui18n-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/libicuuc-host.dylib b/darwin-x86/lib64/libicuuc-host.dylib
new file mode 100755
index 0000000..362f910
--- /dev/null
+++ b/darwin-x86/lib64/libicuuc-host.dylib
Binary files differ
diff --git a/darwin-x86/lib64/liblog.dylib b/darwin-x86/lib64/liblog.dylib
index 4b35c8e..7cdd74f 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 a561af3..d985fd6 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 e15af1d..46b61d7 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 ebdfa89..3e621bf 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 8422a2b..4aeed32 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 54068b2..e4018bf 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 5a013a6..68de288 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 bbb73f2..7a3a26d 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 397dba1..89bd495 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 281fed8..2833cfb 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 76ef02f..c451043 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 b9593a6..210f0a2 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 746b155..f946163 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 44cc590..0633968 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 35856eb..63a0b46 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/libjsoncpp.so b/linux-x86/asan/lib64/libjsoncpp.so
new file mode 100755
index 0000000..525d881
--- /dev/null
+++ b/linux-x86/asan/lib64/libjsoncpp.so
Binary files differ
diff --git a/linux-x86/asan/lib64/liblog.so b/linux-x86/asan/lib64/liblog.so
index 2615ff8..8b45e34 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 b3dbd2c..a0cc563 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/libprocessgroup.so b/linux-x86/asan/lib64/libprocessgroup.so
new file mode 100755
index 0000000..a6d2578
--- /dev/null
+++ b/linux-x86/asan/lib64/libprocessgroup.so
Binary files differ
diff --git a/linux-x86/asan/lib64/libselinux.so b/linux-x86/asan/lib64/libselinux.so
index 09b491e..004ab73 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 bc4c703..d366f89 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 1465d7d..c874f31 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 fdc28d3..fbe2b28 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 73a46cf..233994c 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 0c7305d..caa0541 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 f6698bf..bba3a86 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 40c91bc..72fd73a 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 68b5eb6..2c4cc0e 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 d6870f2..3e017c5 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 814221f..3b40672 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
index b9f317c..3904908 100755
--- a/linux-x86/bin/nsjail
+++ b/linux-x86/bin/nsjail
Binary files differ
diff --git a/linux-x86/bin/one-true-awk b/linux-x86/bin/one-true-awk
index 06119eb..3936481 100755
--- a/linux-x86/bin/one-true-awk
+++ b/linux-x86/bin/one-true-awk
Binary files differ
diff --git a/linux-x86/bin/py2-cmd b/linux-x86/bin/py2-cmd
new file mode 100755
index 0000000..a7bb3cb
--- /dev/null
+++ b/linux-x86/bin/py2-cmd
Binary files differ
diff --git a/linux-x86/bin/toybox b/linux-x86/bin/toybox
index 314d37e..71baeb2 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 48039b9..268421c 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 413065e..1e90492 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 efc144c..d602a85 100755
--- a/linux-x86/bin/ziptime
+++ b/linux-x86/bin/ziptime
Binary files differ
diff --git a/linux-x86/lib64/libandroidicu-host.so b/linux-x86/lib64/libandroidicu-host.so
new file mode 100755
index 0000000..931d284
--- /dev/null
+++ b/linux-x86/lib64/libandroidicu-host.so
Binary files differ
diff --git a/linux-x86/lib64/libbase.so b/linux-x86/lib64/libbase.so
index bf5842d..9a7a8cc 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 fde62fe..f74a76f 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 8b6f4e9..45a16ed 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 94f1021..e88106c 100755
--- a/linux-x86/lib64/libcutils.so
+++ b/linux-x86/lib64/libcutils.so
Binary files differ
diff --git a/linux-x86/lib64/libicui18n-host.so b/linux-x86/lib64/libicui18n-host.so
new file mode 100755
index 0000000..3ac1cc7
--- /dev/null
+++ b/linux-x86/lib64/libicui18n-host.so
Binary files differ
diff --git a/linux-x86/lib64/libicuuc-host.so b/linux-x86/lib64/libicuuc-host.so
new file mode 100755
index 0000000..1a53610
--- /dev/null
+++ b/linux-x86/lib64/libicuuc-host.so
Binary files differ
diff --git a/linux-x86/lib64/libjemalloc.so b/linux-x86/lib64/libjemalloc.so
index e99fd42..8a7b119 100755
--- a/linux-x86/lib64/libjemalloc.so
+++ b/linux-x86/lib64/libjemalloc.so
Binary files differ
diff --git a/linux-x86/lib64/libjsoncpp.so b/linux-x86/lib64/libjsoncpp.so
new file mode 100755
index 0000000..c1cf7a9
--- /dev/null
+++ b/linux-x86/lib64/libjsoncpp.so
Binary files differ
diff --git a/linux-x86/lib64/liblog.so b/linux-x86/lib64/liblog.so
index a196ce0..1ec4dbf 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 b5e938c..0ebe244 100755
--- a/linux-x86/lib64/libpcre2.so
+++ b/linux-x86/lib64/libpcre2.so
Binary files differ
diff --git a/linux-x86/lib64/libprocessgroup.so b/linux-x86/lib64/libprocessgroup.so
new file mode 100755
index 0000000..69cbca8
--- /dev/null
+++ b/linux-x86/lib64/libprocessgroup.so
Binary files differ
diff --git a/linux-x86/lib64/libprotobuf-cpp-full.so b/linux-x86/lib64/libprotobuf-cpp-full.so
index 00489f4..a561859 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/libselinux.so b/linux-x86/lib64/libselinux.so
index 3af4f47..c932140 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 2e06ceb..c9104e6 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 83c4142..6ef5bd1 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,77 +1,141 @@
<?xml version='1.0' encoding='UTF-8'?>
+
<manifest>
<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="b26319ca38cba7d69131ec2c942e1beeb31078fc" upstream="master">
- <linkfile dest="build/tools" src="tools" />
-</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">
+
+ <default remote="aosp" revision="master" />
+
+ <project name="platform/development" path="development" revision="7da7f8870ab89635d312b4e9f4fae0220f544a46" />
+
+ <project clone-depth="1" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="33581f7b65a5545e9ad836bab9495e95a59c63bf" />
+
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk8" path="prebuilts/jdk/jdk8" revision="aaa1e4d6fea9f97b32fe1bd97615b65b1c661f6e" />
+
+ <project name="platform/external/golang-protobuf" path="external/golang-protobuf" revision="3a61e5431bd00a1840213b69992db1dd8cc5e68b" />
+
+ <project name="platform/external/selinux" path="external/selinux" revision="13030b2fd3cc59d77d953455827b9f64da66e0da" />
+
+ <project name="platform/external/desugar" path="external/desugar" revision="ec181dda0f856e6c1aea4f8102ae8af4c145b1f7" />
+
+ <project name="platform/external/ninja" path="external/ninja" revision="f08e4ab341b722b3ba5b4b1669ab37c1bd34ca34" />
+
+ <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="f762d735a9b7bb06cfb9cc4a4e69afcc9ee54c49" />
+
+ <project name="platform/external/flex" path="external/flex" revision="94457957c9e112dc635612b6e4fc2a64222fa995" />
+
+ <project name="platform/external/jsoncpp" path="external/jsoncpp" revision="8811b7906110801faa944027dda93f3c3fa62d87" />
+
+ <project name="platform/external/googletest" path="external/googletest" revision="55da8d1932a429c704e24dca4db7884ad9339167" />
+
+ <project name="platform/external/sqlite" path="external/sqlite" revision="d168e3c466233a2a8992733631b2ea110451f370" />
+
+ <project clone-depth="1" name="platform/prebuilts/build-tools" path="prebuilts/build-tools" revision="d095cc77c8a8baef20276789f6b7a4ac9aa4dd85" />
+
+ <project name="platform/bionic" path="bionic" revision="b656d4a1da35eac817950f906ce1c26259c05e82" />
+
+ <project name="platform/external/icu" path="external/icu" revision="a4d9cc461174336c1af64a82a96efcb2a8bd62a0" />
+
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/go/linux-x86" path="prebuilts/go/linux-x86" revision="394b8054fe2c7c143d15dd3236159971402b5a21" />
+
+ <project name="platform/external/zlib" path="external/zlib" revision="8901016ba19f838ffe8cb8e3721e7caf84442c0d" />
+
+ <project name="platform/external/libcxxabi" path="external/libcxxabi" revision="1389a8dc482d10684a7b30d0aa4c9c58155113ed" />
+
+ <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="af2658892a5d41138a03a8619e9d0258ba23ef31" />
+
+ <project name="platform/external/clang" path="external/clang" revision="32290d3463d1ca9037fc8a1f3aa15129c46f3567" />
+
+ <project name="platform/build/soong" path="build/soong" revision="11545323d23e3a5852aea361d39897cc332882a2">
<linkfile dest="Android.bp" src="root.bp" />
+
<linkfile dest="bootstrap.bash" src="bootstrap.bash" />
</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="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="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="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="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="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="1499e29799182bcd453969dbd71fb45decd7b3a9" upstream="master" />
- <!-- dependency source -->
- <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="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="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="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="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="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="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="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" />
- <project name="toolchain/xz" revision="1eba63ef29b17b43e7e2c6968207bd171b73f485" upstream="master" />
+
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/go/darwin-x86" path="prebuilts/go/darwin-x86" revision="28437c29d829b8c753e7128090faf134181fdf19" />
+
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/windows-x86" path="prebuilts/clang/host/windows-x86" revision="b777438cf4e7cb70265851d77e4625da7cd61904" />
+
+ <project name="platform/external/safe-iop" path="external/safe-iop" revision="b805514f31a231a0e78a18f296c0454fcadead1a" />
+
+ <project name="platform/external/libcxx" path="external/libcxx" revision="0680af728815bb00742ce0302fdf06a59c85f39a" />
+
+ <project name="platform/external/dagger2" path="external/dagger2" revision="8b7f57bb501fc8c65cd0d3f22092fb36f0174dac" />
+
+ <project name="platform/external/boringssl" path="external/boringssl" revision="b6b07c32187eec60f4c9f27e0959c58d145f87ef" />
+
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/ninja/linux-x86" path="prebuilts/ninja/linux-x86" revision="6369b19fc3fbe765636af75d394627e2b92599ed" />
+
+ <project name="platform/external/zopfli" path="external/zopfli" revision="ae7a7d47375836ccc3b442bea7f30b31e7853d43" />
+
+ <project name="platform/external/pcre" path="external/pcre" revision="4d4b0c252c64b9c23c10b92ba66c9f40880e24f9" />
+
+ <project name="platform/build/kati" path="build/kati" revision="eb1899ca38d63c1719d130eafbf625ff8bc37333" />
+
+ <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="d9aafaade740ca38612c742f6d87debf362132ea" />
+
+ <project name="toolchain/make" revision="13854caa2e8addb6dad174944e62a9ef6378e3f2" />
+
+ <project name="platform/external/toybox" path="external/toybox" revision="7548b01c9a22a7de314321b3ff035088a301f1b9" />
+
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/gcc/darwin-x86/host/headers" path="prebuilts/gcc/darwin-x86/host/headers" revision="4ac4f7cc41cf3c9e36fc3d6cf37fd1cfa9587a68" />
+
+ <project clone-depth="1" name="platform/external/error_prone" path="external/error_prone" revision="2e2c823b3112c5f9384d6f8194f115195ef99b11" />
+
+ <project name="platform/external/libunwind" path="external/libunwind" revision="2cda02158017f406a7f3f3e09e51a6349186cb44" />
+
+ <project name="platform/system/core" path="system/core" revision="4bb7b18fe1c00b965d4d4445f06f0047096f3304" />
+
+ <project name="toolchain/xz" revision="1eba63ef29b17b43e7e2c6968207bd171b73f485" />
+
+ <project clone-depth="1" groups="linux" name="platform/prebuilts/clang/host/linux-x86" path="prebuilts/clang/host/linux-x86" revision="803bf398de492bb70560a2444d24491bc42b84ec" />
+
+ <project name="platform/external/expat" path="external/expat" revision="256f1818424f1b99e4d61ac37c46de27d2738f49" />
+
+ <project name="platform/external/jemalloc" path="external/jemalloc" revision="2ba585c129edcaf0b05e1934b316878e1f3307aa" />
+
+ <project clone-depth="1" name="platform/prebuilts/jdk/jdk9" path="prebuilts/jdk/jdk9" revision="60eae91c05b7e653029024fbd37f7994afcb4288" />
+
+ <project name="toolchain/m4" revision="cfddd4f332465a447e87b4c1523fb2b9133e7afd" />
+
+ <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" />
+
+ <project name="platform/external/python/cpython3" path="external/python/cpython3" revision="01ec99604274ff5e9e35329ac38fb15a59da83d8" />
+
+ <project name="platform/external/compiler-rt" path="external/compiler-rt" revision="d9d4fe0f3eecdee619433e3ad4ff24bd1f0d0cdc" />
+
+ <project name="platform/build/blueprint" path="build/blueprint" revision="f01f87af850dd1905fd41c3bc9ebfd856c068e56" />
+
+ <project name="platform/external/libunwind_llvm" path="external/libunwind_llvm" revision="99e952c01a773162b7c55a049be6f22bcd079a5a" />
+
+ <project name="platform/external/llvm" path="external/llvm" revision="c06f72f41a0d3e0b5116971e2cb770384df6ac37" />
+
+ <project name="platform/system/tools/aidl" path="system/tools/aidl" revision="54fa1e0b02f136fb7d545d4a0e800d8ea66f22fb" />
+
+ <project name="platform/build" path="build/make" revision="5fa7e2fa2cfdd17d7cd24760ec3b968dfe110635">
+ <linkfile dest="build/tools" src="tools" />
+</project>
+
+ <project clone-depth="1" name="platform/prebuilts/misc" path="prebuilts/misc" revision="d16cc82d092876f89242230ef69a5879f27fc798" />
+
+ <project name="platform/external/bison" path="external/bison" revision="a8ab20ff88a9b962a8eb39cdb6944a2354f78748" />
+
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/clang/host/darwin-x86" path="prebuilts/clang/host/darwin-x86" revision="b5617d34153bc3249d2a4314eb9224b114b58913" />
+
+ <project name="platform/external/arm-optimized-routines" path="external/arm-optimized-routines" revision="196c9cfa5a198837d8dcdd6e1722f5605fe5347c" />
+
+ <project name="platform/external/protobuf" path="external/protobuf" revision="6ed677222c3fdaa455cd1cf09307f07d19186a1a" />
+
+ <project name="platform/external/nsjail" path="external/nsjail" revision="a25cd900710305660a653c6b63d76286d8d6cdfe" />
+
+ <project clone-depth="1" groups="darwin" name="platform/prebuilts/ninja/darwin-x86" path="prebuilts/ninja/darwin-x86" revision="00f798346dedb4a7a6a6dcc9ad32ff09d66ee0db" />
+
+ <project name="platform/external/one-true-awk" path="external/one-true-awk" revision="56215208c0bc33009630223a3bb2345aeffa8a02" />
+
+ <project name="platform/external/python/cpython2" path="external/python/cpython2" revision="a7c6b232c595589642caa1833279d940661120c2" />
+
+ <project name="platform/dalvik" path="dalvik" revision="9c98845827afbe8e3edb81b9c4fe64de8a6b01a3" />
+
+ <project name="toolchain/go" revision="790cd13b5a1ebd944f7b1e707bc664e5a1d1d38d" />
+
+ <project name="platform/external/turbine" path="external/turbine" revision="87068a5236e63687231098ff446d9186b94ff00d" />
</manifest>
diff --git a/path/README b/path/README
new file mode 100644
index 0000000..fa127f6
--- /dev/null
+++ b/path/README
@@ -0,0 +1,3 @@
+These directories will be added to $PATH during the build in order to provide
+some common tools normally found in the system $PATH. They're all symlinks into
+the prebuilts found elsewhere in this repository.
diff --git a/path/darwin-x86/awk b/path/darwin-x86/awk
new file mode 120000
index 0000000..ced0fa9
--- /dev/null
+++ b/path/darwin-x86/awk
@@ -0,0 +1 @@
+../../darwin-x86/bin/one-true-awk
\ No newline at end of file
diff --git a/path/darwin-x86/python b/path/darwin-x86/python
new file mode 120000
index 0000000..c34aaae
--- /dev/null
+++ b/path/darwin-x86/python
@@ -0,0 +1 @@
+../../darwin-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/path/darwin-x86/python2 b/path/darwin-x86/python2
new file mode 120000
index 0000000..c34aaae
--- /dev/null
+++ b/path/darwin-x86/python2
@@ -0,0 +1 @@
+../../darwin-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/path/darwin-x86/python2.7 b/path/darwin-x86/python2.7
new file mode 120000
index 0000000..c34aaae
--- /dev/null
+++ b/path/darwin-x86/python2.7
@@ -0,0 +1 @@
+../../darwin-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/path/linux-x86/awk b/path/linux-x86/awk
new file mode 120000
index 0000000..28cb505
--- /dev/null
+++ b/path/linux-x86/awk
@@ -0,0 +1 @@
+../../linux-x86/bin/one-true-awk
\ No newline at end of file
diff --git a/toybox/linux-x86/basename b/path/linux-x86/basename
similarity index 100%
rename from toybox/linux-x86/basename
rename to path/linux-x86/basename
diff --git a/toybox/linux-x86/cat b/path/linux-x86/cat
similarity index 100%
rename from toybox/linux-x86/cat
rename to path/linux-x86/cat
diff --git a/toybox/linux-x86/chmod b/path/linux-x86/chmod
similarity index 100%
rename from toybox/linux-x86/chmod
rename to path/linux-x86/chmod
diff --git a/toybox/linux-x86/cmp b/path/linux-x86/cmp
similarity index 100%
rename from toybox/linux-x86/cmp
rename to path/linux-x86/cmp
diff --git a/toybox/linux-x86/comm b/path/linux-x86/comm
similarity index 100%
rename from toybox/linux-x86/comm
rename to path/linux-x86/comm
diff --git a/toybox/linux-x86/cmp b/path/linux-x86/cp
similarity index 100%
copy from toybox/linux-x86/cmp
copy to path/linux-x86/cp
diff --git a/toybox/linux-x86/cut b/path/linux-x86/cut
similarity index 100%
rename from toybox/linux-x86/cut
rename to path/linux-x86/cut
diff --git a/toybox/linux-x86/dirname b/path/linux-x86/dirname
similarity index 100%
rename from toybox/linux-x86/dirname
rename to path/linux-x86/dirname
diff --git a/toybox/linux-x86/du b/path/linux-x86/du
similarity index 100%
rename from toybox/linux-x86/du
rename to path/linux-x86/du
diff --git a/toybox/linux-x86/echo b/path/linux-x86/echo
similarity index 100%
rename from toybox/linux-x86/echo
rename to path/linux-x86/echo
diff --git a/toybox/linux-x86/env b/path/linux-x86/env
similarity index 100%
rename from toybox/linux-x86/env
rename to path/linux-x86/env
diff --git a/toybox/linux-x86/expr b/path/linux-x86/expr
similarity index 100%
rename from toybox/linux-x86/expr
rename to path/linux-x86/expr
diff --git a/toybox/linux-x86/getconf b/path/linux-x86/getconf
similarity index 100%
rename from toybox/linux-x86/getconf
rename to path/linux-x86/getconf
diff --git a/toybox/linux-x86/head b/path/linux-x86/head
similarity index 100%
rename from toybox/linux-x86/head
rename to path/linux-x86/head
diff --git a/toybox/linux-x86/basename b/path/linux-x86/hostname
similarity index 100%
copy from toybox/linux-x86/basename
copy to path/linux-x86/hostname
diff --git a/toybox/linux-x86/id b/path/linux-x86/id
similarity index 100%
rename from toybox/linux-x86/id
rename to path/linux-x86/id
diff --git a/toybox/linux-x86/ln b/path/linux-x86/ln
similarity index 100%
rename from toybox/linux-x86/ln
rename to path/linux-x86/ln
diff --git a/toybox/linux-x86/ls b/path/linux-x86/ls
similarity index 100%
rename from toybox/linux-x86/ls
rename to path/linux-x86/ls
diff --git a/toybox/linux-x86/comm b/path/linux-x86/md5sum
similarity index 100%
copy from toybox/linux-x86/comm
copy to path/linux-x86/md5sum
diff --git a/toybox/linux-x86/mkdir b/path/linux-x86/mkdir
similarity index 100%
rename from toybox/linux-x86/mkdir
rename to path/linux-x86/mkdir
diff --git a/toybox/linux-x86/mktemp b/path/linux-x86/mktemp
similarity index 100%
rename from toybox/linux-x86/mktemp
rename to path/linux-x86/mktemp
diff --git a/toybox/linux-x86/env b/path/linux-x86/mv
similarity index 100%
copy from toybox/linux-x86/env
copy to path/linux-x86/mv
diff --git a/toybox/linux-x86/od b/path/linux-x86/od
similarity index 100%
rename from toybox/linux-x86/od
rename to path/linux-x86/od
diff --git a/toybox/linux-x86/paste b/path/linux-x86/paste
similarity index 100%
rename from toybox/linux-x86/paste
rename to path/linux-x86/paste
diff --git a/toybox/linux-x86/sleep b/path/linux-x86/pgrep
similarity index 100%
copy from toybox/linux-x86/sleep
copy to path/linux-x86/pgrep
diff --git a/toybox/linux-x86/tail b/path/linux-x86/pkill
similarity index 100%
copy from toybox/linux-x86/tail
copy to path/linux-x86/pkill
diff --git a/toybox/linux-x86/ls b/path/linux-x86/ps
similarity index 100%
copy from toybox/linux-x86/ls
copy to path/linux-x86/ps
diff --git a/toybox/linux-x86/pwd b/path/linux-x86/pwd
similarity index 100%
rename from toybox/linux-x86/pwd
rename to path/linux-x86/pwd
diff --git a/path/linux-x86/python b/path/linux-x86/python
new file mode 120000
index 0000000..8ec5dcd
--- /dev/null
+++ b/path/linux-x86/python
@@ -0,0 +1 @@
+../../linux-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/path/linux-x86/python2 b/path/linux-x86/python2
new file mode 120000
index 0000000..8ec5dcd
--- /dev/null
+++ b/path/linux-x86/python2
@@ -0,0 +1 @@
+../../linux-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/path/linux-x86/python2.7 b/path/linux-x86/python2.7
new file mode 120000
index 0000000..8ec5dcd
--- /dev/null
+++ b/path/linux-x86/python2.7
@@ -0,0 +1 @@
+../../linux-x86/bin/py2-cmd
\ No newline at end of file
diff --git a/toybox/linux-x86/readlink b/path/linux-x86/readlink
similarity index 100%
rename from toybox/linux-x86/readlink
rename to path/linux-x86/readlink
diff --git a/toybox/linux-x86/comm b/path/linux-x86/rm
similarity index 100%
copy from toybox/linux-x86/comm
copy to path/linux-x86/rm
diff --git a/toybox/linux-x86/rmdir b/path/linux-x86/rmdir
similarity index 100%
rename from toybox/linux-x86/rmdir
rename to path/linux-x86/rmdir
diff --git a/toybox/linux-x86/id b/path/linux-x86/sed
similarity index 100%
copy from toybox/linux-x86/id
copy to path/linux-x86/sed
diff --git a/toybox/linux-x86/setsid b/path/linux-x86/setsid
similarity index 100%
rename from toybox/linux-x86/setsid
rename to path/linux-x86/setsid
diff --git a/toybox/linux-x86/comm b/path/linux-x86/sha1sum
similarity index 100%
copy from toybox/linux-x86/comm
copy to path/linux-x86/sha1sum
diff --git a/toybox/linux-x86/comm b/path/linux-x86/sha256sum
similarity index 100%
copy from toybox/linux-x86/comm
copy to path/linux-x86/sha256sum
diff --git a/toybox/linux-x86/comm b/path/linux-x86/sha512sum
similarity index 100%
copy from toybox/linux-x86/comm
copy to path/linux-x86/sha512sum
diff --git a/toybox/linux-x86/sleep b/path/linux-x86/sleep
similarity index 100%
rename from toybox/linux-x86/sleep
rename to path/linux-x86/sleep
diff --git a/toybox/linux-x86/sort b/path/linux-x86/sort
similarity index 100%
rename from toybox/linux-x86/sort
rename to path/linux-x86/sort
diff --git a/toybox/linux-x86/stat b/path/linux-x86/stat
similarity index 100%
rename from toybox/linux-x86/stat
rename to path/linux-x86/stat
diff --git a/toybox/linux-x86/tail b/path/linux-x86/tail
similarity index 100%
rename from toybox/linux-x86/tail
rename to path/linux-x86/tail
diff --git a/toybox/linux-x86/tee b/path/linux-x86/tee
similarity index 100%
rename from toybox/linux-x86/tee
rename to path/linux-x86/tee
diff --git a/toybox/linux-x86/touch b/path/linux-x86/touch
similarity index 100%
rename from toybox/linux-x86/touch
rename to path/linux-x86/touch
diff --git a/toybox/linux-x86/true b/path/linux-x86/true
similarity index 100%
rename from toybox/linux-x86/true
rename to path/linux-x86/true
diff --git a/toybox/linux-x86/uname b/path/linux-x86/uname
similarity index 100%
rename from toybox/linux-x86/uname
rename to path/linux-x86/uname
diff --git a/toybox/linux-x86/uniq b/path/linux-x86/uniq
similarity index 100%
rename from toybox/linux-x86/uniq
rename to path/linux-x86/uniq
diff --git a/toybox/linux-x86/unix2dos b/path/linux-x86/unix2dos
similarity index 100%
rename from toybox/linux-x86/unix2dos
rename to path/linux-x86/unix2dos
diff --git a/toybox/linux-x86/basename b/path/linux-x86/wc
similarity index 100%
copy from toybox/linux-x86/basename
copy to path/linux-x86/wc
diff --git a/toybox/linux-x86/touch b/path/linux-x86/which
similarity index 100%
copy from toybox/linux-x86/touch
copy to path/linux-x86/which
diff --git a/toybox/linux-x86/whoami b/path/linux-x86/whoami
similarity index 100%
rename from toybox/linux-x86/whoami
rename to path/linux-x86/whoami
diff --git a/toybox/linux-x86/xargs b/path/linux-x86/xargs
similarity index 100%
rename from toybox/linux-x86/xargs
rename to path/linux-x86/xargs
diff --git a/toybox/linux-x86/xxd b/path/linux-x86/xxd
similarity index 100%
rename from toybox/linux-x86/xxd
rename to path/linux-x86/xxd