diff options
| author | Alistair Delva <adelva@google.com> | 2019-12-11 09:24:01 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2019-12-11 17:26:47 +0000 |
| commit | 6cf53d7cbe2023df9a20fae01f3255341d50535a (patch) | |
| tree | 2243ba9bf124712b4e6b2ab77c8e1930d845c19c | |
| parent | cdd15ece303c1b5e784bf00e85ffe619273eeabd (diff) | |
| download | manifest-6cf53d7cbe2023df9a20fae01f3255341d50535a.tar.gz | |
Fix crosvm-master build
Partial cherry-pick of I462c0be49c76102a44f7f511a6179060be83118b
("Merge Android10 QPR1.") which removes some projects with conflicting
Android.bp targets.
Change-Id: I4bb68a11eb7b803ef04b07a9a0f33d2610373383
Signed-off-by: Alistair Delva <adelva@google.com>
| -rw-r--r-- | default.xml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/default.xml b/default.xml index 724bf3d75..40d7cc118 100644 --- a/default.xml +++ b/default.xml @@ -308,9 +308,7 @@ <project path="external/nfacct" name="platform/external/nfacct" groups="pdk" clone-depth="1" /> <project path="external/nist-pkits" name="platform/external/nist-pkits" groups="pdk" clone-depth="1" /> <project path="external/nist-sip" name="platform/external/nist-sip" groups="pdk" clone-depth="1" /> - <project path="external/nos/host/android" name="platform/external/nos/host/android" groups="pixel" clone-depth="1" /> <project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pixel" clone-depth="1" /> - <project path="external/nos/test/system-test-harness" name="platform/external/nos/test/system-test-harness" groups="pixel" clone-depth="1" /> <project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" clone-depth="1" /> <project path="external/oauth" name="platform/external/oauth" groups="pdk" clone-depth="1" /> <project path="external/objenesis" name="platform/external/objenesis" groups="pdk" clone-depth="1" /> |