diff options
| author | Colin Cross <ccross@android.com> | 2015-09-21 09:17:58 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-11-03 22:58:23 -0800 |
| commit | a388ce9895e3474866e81d977e8e4f241a7330bd (patch) | |
| tree | a13708479cadbb462ada302284ee4dcd443ed87c | |
| parent | e84fe83e60a12f6edaa5cdbf0d5151b0ccf30839 (diff) | |
| download | manifest-a388ce9895e3474866e81d977e8e4f241a7330bd.tar.gz | |
tradefed: add new build system projects to manifest
Add kati and ninja to allow enabling USE_NINJA=true as the default, and
add soong, blueprint, and go for future build system changes. ninja.mk
uses clang to compile kati, and gcc for headers, so add them too.
Bug: 25449510
Change-Id: I99f94b34f6b8b0099b0ee6bf7b579e7c0229f94f
(cherry picked from commit 79545a363bcd26671f6c61d1304151241b56a01b)
| -rw-r--r-- | default.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/default.xml b/default.xml index 42d31f091..3c2803519 100644 --- a/default.xml +++ b/default.xml @@ -11,6 +11,12 @@ <project path="build" name="platform/build"> <copyfile src="core/root.mk" dest="Makefile" /> </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" /> + </project> <project path="external/easymock" name="platform/external/easymock" /> <project path="external/emma" name="platform/external/emma" /> <project path="external/guava" name="platform/external/guava" /> @@ -20,7 +26,17 @@ <project path="external/jsr305" name="platform/external/jsr305" /> <project path="external/junit" name="platform/external/junit" /> <project path="external/proguard" name="platform/external/proguard" /> + <project path="prebuilts/clang/darwin-x86/host/3.6" name="platform/prebuilts/clang/darwin-x86/host/3.6" groups="pdk,darwin" /> + <project path="prebuilts/clang/linux-x86/host/3.6" name="platform/prebuilts/clang/linux-x86/host/3.6" groups="pdk,linux" /> + <project path="prebuilts/clang/host/darwin-x86" name="platform/prebuilts/clang/host/darwin-x86" groups="pdk,darwin" /> + <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" groups="pdk,linux" /> + <project path="prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" name="platform/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1" groups="darwin" /> + <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8" groups="linux" /> + <project path="prebuilts/go/darwin-x86" name="platform/prebuilts/go/darwin-x86" groups="darwin" /> + <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux" /> <project path="prebuilts/misc" name="platform/prebuilts/misc" /> + <project path="prebuilts/ninja/darwin-x86" name="platform/prebuilts/ninja/darwin-x86" groups="darwin" /> + <project path="prebuilts/ninja/linux-x86" name="platform/prebuilts/ninja/linux-x86" groups="linux" /> <project path="prebuilts/sdk" name="platform/prebuilts/sdk" /> <project path="tools/loganalysis" name="platform/tools/loganalysis" /> <project path="tools/tradefederation" name="platform/tools/tradefederation" /> |