diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-10-04 15:22:02 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-10-04 15:24:03 -0700 |
| commit | ebd98cb83ec3e37032575381a2973f7892723fbc (patch) | |
| tree | f66359fc2f70e78acd8753a9692fd6667e36eb99 /default.xml | |
| parent | 4eeaab55129830e5ac0abd4036d82e4403e5f586 (diff) | |
| download | manifest-ebd98cb83ec3e37032575381a2973f7892723fbc.tar.gz | |
Add m4, make, one-true-awk, toybox to build-tools
Bison is currently using `m4` from the host system, pull the source in
here so that we can create a prebuilt to use instead.
Make is being used by a number of tools still (kernels, bootlaoders,
etc). In the short/medium term people are still going to be building
them in platform builds. So may as well make them hermetic.
Adding awk and toybox are the next step in providing a hermetic build
environment by using prebuilts for some common host commands instead of
relying on the system-provided ones.
Also rearranges the target list, pulling bison, flex, and kati from
dependencies into the target section, since we're distributing things
from them.
Test: treehugger
Change-Id: I1f69c977150ec6cecd0ba3a85ce0e73029e393c2
Diffstat (limited to 'default.xml')
| -rw-r--r-- | default.xml | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/default.xml b/default.xml index 90d5648ba..c1caec4dc 100644 --- a/default.xml +++ b/default.xml @@ -13,7 +13,6 @@ <linkfile src="tools" dest="build/tools" /> </project> <project path="build/blueprint" name="platform/build/blueprint" /> - <project path="build/kati" name="platform/build/kati" /> <project path="build/soong" name="platform/build/soong" > <linkfile src="root.bp" dest="Android.bp" /> <linkfile src="bootstrap.bash" dest="bootstrap.bash" /> @@ -47,12 +46,10 @@ <!-- dependency source --> <project path="development" name="platform/development" /> - <project path="external/bison" name="platform/external/bison" /> <project path="external/clang" name="platform/external/clang" /> <project path="external/compiler-rt" name="platform/external/compiler-rt" /> <project path="external/dagger2" name="platform/external/dagger2" /> <project path="external/error_prone" name="platform/external/error_prone" clone-depth="1" /> - <project path="external/flex" name="platform/external/flex" /> <project path="external/googletest" name="platform/external/googletest" /> <project path="external/jemalloc" name="platform/external/jemalloc" /> <project path="external/libcxx" name="platform/external/libcxx" /> @@ -69,11 +66,18 @@ <project path="system/core" name="platform/system/core" /> <!-- target projects --> - <project path="toolchain/go" name="toolchain/go" /> - <project path="toolchain/xz" name="toolchain/xz" /> + <project path="build/kati" name="platform/build/kati" /> <project path="dalvik" name="platform/dalvik" /> + <project path="external/bison" name="platform/external/bison" /> <project path="external/desugar" name="platform/external/desugar" /> + <project path="external/flex" name="platform/external/flex" /> <project path="external/ninja" name="platform/external/ninja" /> + <project path="external/one-true-awk" name="platform/external/one-true-awk" /> + <project path="external/toybox" name="platform/external/toybox" /> <project path="external/turbine" name="platform/external/turbine" /> <project path="system/tools/aidl" name="platform/system/tools/aidl" /> + <project name="toolchain/go" /> + <project name="toolchain/m4" /> + <project name="toolchain/make" /> + <project name="toolchain/xz" /> </manifest> |