diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-08-22 21:25:34 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-08-28 17:13:46 -0700 |
| commit | 3fdc21e87c1f901187178c6cd43146884e51b6d0 (patch) | |
| tree | 6e66410cfed7da7ce8ee80b463d7de14fa9d1d87 | |
| parent | 792b9cd10b254518e48cfa58831587ea72303080 (diff) | |
| download | manifest-3fdc21e87c1f901187178c6cd43146884e51b6d0.tar.gz | |
Update tradefed manifest for build system changes
* platform/build must be checked out into build/make
* bootstrap.bash is obsolete
* prebuilts/ninja is obsolete
* external/golang-protobuf will be required
Fixes: 65012034
| -rw-r--r-- | default.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/default.xml b/default.xml index 8b4d103cd..1eafc7b39 100644 --- a/default.xml +++ b/default.xml @@ -8,17 +8,23 @@ remote="aosp" sync-j="4" /> - <project path="build" name="platform/build"> + <project path="build/make" name="platform/build"> <copyfile src="core/root.mk" dest="Makefile" /> + <linkfile src="CleanSpec.mk" dest="build/CleanSpec.mk" /> + <linkfile src="buildspec.mk.default" dest="build/buildspec.mk.default" /> + <linkfile src="core" dest="build/core" /> + <linkfile src="envsetup.sh" dest="build/envsetup.sh" /> + <linkfile src="target" dest="build/target" /> + <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" /> </project> <project path="external/easymock" name="platform/external/easymock" /> <project path="external/emma" name="platform/external/emma" /> + <project path="external/golang-protobuf" name="platform/external/golang-protobuf" clone-depth="1" /> <project path="external/guava" name="platform/external/guava" /> <project path="external/hamcrest" name="platform/external/hamcrest" /> <project path="external/hsqldb" name="platform/external/hsqldb" /> @@ -37,8 +43,6 @@ <project path="prebuilts/go/linux-x86" name="platform/prebuilts/go/linux-x86" groups="linux" /> <project path="prebuilts/jdk/jdk8" name="platform/prebuilts/jdk/jdk8" groups="pdk" clone-depth="1" /> <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/core" name="platform/tools/tradefederation" /> |