diff options
| author | Yifan Hong <elsk@google.com> | 2021-11-18 19:52:27 +0000 |
|---|---|---|
| committer | Yifan Hong <elsk@google.com> | 2021-11-18 19:52:43 +0000 |
| commit | eda4af0e220b8c439b542d683fc44ac3812dd577 (patch) | |
| tree | 3ded0a1a745ee4c01cb45bff8d0358fe920d8a30 | |
| parent | 6e9da0d4cf88938e471c4f014a18a46d8f903ba1 (diff) | |
| download | manifest-eda4af0e220b8c439b542d683fc44ac3812dd577.tar.gz | |
Revert "Migrate build/ to build/kernel (step 1)"
This reverts commit 6e9da0d4cf88938e471c4f014a18a46d8f903ba1.
Reason for revert: breaking checkpatch
Bug: 204425264
Change-Id: I1748d974c287ac8d2fb1041f76ad27e256b5d9ff
| -rw-r--r-- | default.xml | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/default.xml b/default.xml index 3880b22..5ee3912 100644 --- a/default.xml +++ b/default.xml @@ -5,23 +5,9 @@ <superproject name="kernel/superproject" remote="aosp"/> - <project path="build/kernel" name="kernel/build" > + <project path="build" name="kernel/build" > <linkfile src="kleaf/bazel.sh" dest="tools/bazel" /> <linkfile src="kleaf/bazel.WORKSPACE" dest="WORKSPACE" /> - <linkfile src="build.sh" dest="build/build.sh" /> - <linkfile src="build_abi.sh" dest="build/build_abi.sh" /> - <linkfile src="build_test.sh" dest="build/build_test.sh" /> - <linkfile src="build_utils.sh" dest="build/build_utils.sh" /> - <!-- TODO(b/204425264): Remove unused scripts and unused symlinks --> - <linkfile src="BUILD.bazel" dest="build/BUILD.bazel" /> - <linkfile src="build-tools/path" dest="build/build-tools/path" /> - <linkfile src="config.sh" dest="build/config.sh" /> - <linkfile src="envsetup.sh" dest="build/envsetup.sh" /> - <linkfile src="_setup_env.sh" dest="build/_setup_env.sh" /> - <linkfile src="multi-switcher.sh" dest="build/multi-switcher.sh" /> - <linkfile src="kleaf" dest="build/kleaf" /> - <linkfile src="abi" dest="build/abi" /> - <linkfile src="static_analysis" dest="build/static_analysis" /> </project> <project path="common" name="kernel/common" revision="android-mainline" > <linkfile src="." dest=".source_date_epoch_dir" /> @@ -33,19 +19,10 @@ <project path="kernel/configs" name="kernel/configs" revision="master" /> <project path="common-modules/virtual-device" name="kernel/common-modules/virtual-device" revision="android-mainline" /> <project path="prebuilts/clang/host/linux-x86" name="platform/prebuilts/clang/host/linux-x86" clone-depth="1" /> - <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" > - <!-- TODO(b/204425264): Remove unused scripts and unused symlinks --> - <linkfile src="sysroot" dest="build/build-tools/sysroot" /> - </project> + <project path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" clone-depth="1" /> <project path="prebuilts/boot-artifacts" name="platform/prebuilts/boot-artifacts" /> - <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" > - <!-- TODO(b/204425264): Remove unused scripts and unused symlinks --> - <linkfile src="." dest="build/prebuilts/build-tools" /> - </project> - <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" > - <!-- TODO(b/204425264): Remove unused scripts and unused symlinks --> - <linkfile src="." dest="build/prebuilts/kernel-build-tools" /> - </project> + <project path="prebuilts/build-tools" name="platform/prebuilts/build-tools" clone-depth="1" /> + <project path="prebuilts/kernel-build-tools" name="kernel/prebuilts/build-tools" clone-depth="1" /> <project path="tools/mkbootimg" name="platform/system/tools/mkbootimg" /> <project path="prebuilts/bazel/linux-x86_64" name="platform/prebuilts/bazel/linux-x86_64" clone-depth="1" /> |