diff options
| author | Martin Stjernholm <mast@google.com> | 2020-07-02 16:37:05 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-09-30 18:26:53 +0100 |
| commit | 02a3f3891a1ece0848dcf2c1a4b15a18c3ccba60 (patch) | |
| tree | ac44181bcdecf2d5a1b73942b8baab6eade909ca | |
| parent | 37a7a76c90c62aac04a94b2a6333155ad892afe4 (diff) | |
| download | manifest-02a3f3891a1ece0848dcf2c1a4b15a18c3ccba60.tar.gz | |
Add prebuilts/runtime back into the full platform manifest (reland).
Soong is now able to handle the prebuilts with prefer false. This
reestablishes the automerger path from AOSP to internal for
prebuilts/runtime.
This is a reland of https://r.android.com/1354642. The problem in
b/166820626 that caused a revert is fixed with
https://r.android.com/1427729, https://r.android.com/1440268,
http://ag/12735795.
Test: m
Test: Cuttlefish boot
Test: lunch aosp_blueline_hwasan-userdebug && m nothing
Test: m SANITIZE_TARGET=address nothing
Bug: 151303681
Change-Id: Ib1aa80993196105cde1f3da45b86432a55a8bf6f
| -rw-r--r-- | default.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/default.xml b/default.xml index b4e0a34f1..d58fae4fa 100644 --- a/default.xml +++ b/default.xml @@ -813,6 +813,7 @@ <project path="prebuilts/python/linux-x86/2.7.5" name="platform/prebuilts/python/linux-x86/2.7.5" groups="linux,pdk,pdk-cw-fs,pdk-fs" clone-depth="1" /> <project path="prebuilts/qemu-kernel" name="platform/prebuilts/qemu-kernel" groups="pdk" clone-depth="1" /> <project path="prebuilts/remoteexecution-client" name="platform/prebuilts/remoteexecution-client" groups="pdk" clone-depth="1" /> + <project path="prebuilts/runtime" name="platform/prebuilts/runtime" groups="pdk" clone-depth="1" /> <project path="prebuilts/rust" name="platform/prebuilts/rust" groups="pdk" clone-depth="1" /> <project path="prebuilts/r8" name="platform/prebuilts/r8" groups="pdk" clone-depth="1" /> <project path="prebuilts/sdk" name="platform/prebuilts/sdk" groups="pdk" clone-depth="1" /> |