summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-12-02 22:37:15 -0800
committerXin Li <delphij@google.com>2019-12-03 17:47:19 +0000
commitdce9da4f7629b6fc4d508bd7c8cc10b2b40e093d (patch)
tree4a848060b79f77f863126b85d1b255db5a763fb1
parentcbefdd0d20cc8916370b7709db9c28f0f3e703fb (diff)
downloadmanifest-dce9da4f7629b6fc4d508bd7c8cc10b2b40e093d.tar.gz
Merge Android10 QPR1.
Bug: 145570283 Merged-In: Ifdc1671c8a38b36aa83781b7c2800c8bcecb45ce Change-Id: I462c0be49c76102a44f7f511a6179060be83118b
-rw-r--r--default.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/default.xml b/default.xml
index 32bbe5fff..991a4a8b9 100644
--- a/default.xml
+++ b/default.xml
@@ -74,7 +74,7 @@
<project path="device/google/vrservices" name="device/google/vrservices" groups="pdk" clone-depth="1" />
<project path="device/google/wahoo" name="device/google/wahoo" groups="device,generic_fs,wahoo" />
<project path="device/google/wahoo-kernel" name="device/google/wahoo-kernel" groups="device,generic_fs,wahoo" clone-depth="1" />
- <project path="device/google_car" name="device/google_car" groups="device,generic_fs"/>
+ <project path="device/google_car" name="device/google_car" groups="device,generic_fs" />
<project path="device/linaro/bootloader/arm-trusted-firmware" name="device/linaro/bootloader/arm-trusted-firmware" />
<project path="device/linaro/bootloader/edk2" name="device/linaro/bootloader/edk2" />
<project path="device/linaro/bootloader/OpenPlatformPkg" name="device/linaro/bootloader/OpenPlatformPkg" />
@@ -252,6 +252,7 @@
<project path="external/libevent" name="platform/external/libevent" groups="pdk" />
<project path="external/libexif" name="platform/external/libexif" groups="pdk" />
<project path="external/libffi" name="platform/external/libffi" groups="pdk" />
+ <project path="external/libgav1" name="platform/external/libgav1" groups="pdk" />
<project path="external/libfuse" name="platform/external/libfuse" groups="pdk" />
<project path="external/libgsm" name="platform/external/libgsm" groups="pdk" />
<project path="external/libhevc" name="platform/external/libhevc" groups="pdk" />
@@ -312,9 +313,7 @@
<project path="external/nfacct" name="platform/external/nfacct" groups="pdk" />
<project path="external/nist-pkits" name="platform/external/nist-pkits" groups="pdk" />
<project path="external/nist-sip" name="platform/external/nist-sip" groups="pdk" />
- <project path="external/nos/host/android" name="platform/external/nos/host/android" groups="pixel" />
<project path="external/nos/host/generic" name="platform/external/nos/host/generic" groups="pixel" />
- <project path="external/nos/test/system-test-harness" name="platform/external/nos/test/system-test-harness" groups="pixel" />
<project path="external/noto-fonts" name="platform/external/noto-fonts" groups="pdk" />
<project path="external/oauth" name="platform/external/oauth" groups="pdk" />
<project path="external/objenesis" name="platform/external/objenesis" groups="pdk" />
@@ -507,6 +506,7 @@
<project path="hardware/google/easel" name="platform/hardware/google/easel" groups="pdk,easel" />
<project path="hardware/google/interfaces" name="platform/hardware/google/interfaces" groups="pdk" />
<project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="generic_fs,pixel" />
+ <project path="hardware/google/pixel-sepolicy" name="platform/hardware/google/pixel-sepolicy" groups="generic_fs,pixel" />
<project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk" />
<project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk" />
<project path="hardware/knowles/athletico/sound_trigger_hal" name="platform/hardware/knowles/athletico/sound_trigger_hal" groups="coral" />