summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-12-09 10:25:11 -0800
committerXin Li <delphij@google.com>2022-12-09 10:25:11 -0800
commit3017edf34fa240bc60a614ee80b7df6f5232d5b2 (patch)
treeabda32377c054f89bd0ed8ad8f0e1edb1f5e6f48
parentf5ff0de7954c460ad4e63ab618adad1e89c7b000 (diff)
downloadmanifest-3017edf34fa240bc60a614ee80b7df6f5232d5b2.tar.gz
Merge Android 13 QPR1
Bug: 261731544 Bug: 255404110 Fixed: 255404110 Merged-In: I08193c62b3a156d6c8890803a1d2c4c82b5a6aa1 Change-Id: I32c00a932be72c0992a221a2a98f12ec1fad1b01
-rw-r--r--default.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/default.xml b/default.xml
index 372b521e1..e017a9436 100644
--- a/default.xml
+++ b/default.xml
@@ -77,15 +77,15 @@
<project path="device/google/coral-kernel" name="device/google/coral-kernel" groups="device,coral,generic_fs" clone-depth="1" />
<project path="device/google/coral-sepolicy" name="device/google/coral-sepolicy" groups="device,coral,generic_fs" />
<project path="device/google/fuchsia" name="device/google/fuchsia" groups="device,fuchsia" />
- <project path="device/google/gs101" name="device/google/gs101" groups="device,slider,pdk-gs-arm" />
- <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider,pdk-gs-arm" />
+ <project path="device/google/gs101" name="device/google/gs101" groups="device,slider,bluejay,pdk-gs-arm" />
+ <project path="device/google/gs101-sepolicy" name="device/google/gs101-sepolicy" groups="device,slider,bluejay,pdk-gs-arm" />
<project path="device/google/gs201" name="device/google/gs201" groups="device,cloudripper" />
<project path="device/google/gs201-sepolicy" name="device/google/gs201-sepolicy" groups="device,cloudripper" />
- <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,pdk-gs-arm" />
- <project path="device/google/raviole" name="device/google/raviole" groups="device,slider,pdk-gs-arm" />
+ <project path="device/google/gs-common" name="device/google/gs-common" groups="device,slider,bluejay,cloudripper,pdk-gs-arm" />
<project path="device/google/pantah" name="device/google/pantah" groups="device,cloudripper" />
<project path="device/google/pantah-sepolicy" name="device/google/pantah-sepolicy" groups="device,cloudripper" />
<project path="device/google/pantah-kernel" name="device/google/pantah-kernel" groups="device,cloudripper" clone-depth="1" />
+ <project path="device/google/raviole" name="device/google/raviole" groups="device,slider,pdk-gs-arm" />
<project path="device/google/raviole-kernel" name="device/google/raviole-kernel" groups="device,slider,pdk-gs-arm" clone-depth="1" />
<project path="device/google/redbull" name="device/google/redbull" groups="device,redbull" />
<project path="device/google/redbull-kernel" name="device/google/redbull-kernel" groups="device,bramble,redfin" clone-depth="1" />
@@ -943,11 +943,14 @@
<project path="packages/apps/Car/SystemUI" name="platform/packages/apps/Car/SystemUI" groups="pdk-fs" />
<project path="packages/apps/Car/Cluster" name="platform/packages/apps/Car/Cluster" groups="pdk-fs" />
<project path="packages/apps/Car/DebuggingRestrictionController" name="platform/packages/apps/Car/DebuggingRestrictionController" groups="pdk-fs" />
+ <project path="packages/apps/Car/DialerPrebuilt" name="platform/packages/apps/Car/DialerPrebuilt" groups="pdk-fs" />
<project path="packages/apps/Car/Hvac" name="platform/packages/apps/Car/Hvac" groups="pdk-fs" />
<project path="packages/apps/Car/LatinIME" name="platform/packages/apps/Car/LatinIME" groups="pdk-fs" />
<project path="packages/apps/Car/Launcher" name="platform/packages/apps/Car/Launcher" groups="pdk-fs" />
<project path="packages/apps/Car/LinkViewer" name="platform/packages/apps/Car/LinkViewer" groups="pdk-fs" />
<project path="packages/apps/Car/LocalMediaPlayer" name="platform/packages/apps/Car/LocalMediaPlayer" groups="pdk-fs" />
+ <project path="packages/apps/Car/MediaPrebuilt" name="platform/packages/apps/Car/MediaPrebuilt" groups="pdk-fs" />
+ <project path="packages/apps/Car/MessengerPrebuilt" name="platform/packages/apps/Car/MessengerPrebuilt" groups="pdk-fs" />
<project path="packages/apps/Car/Notification" name="platform/packages/apps/Car/Notification" groups="pdk-fs" />
<project path="packages/apps/Car/Provision" name="platform/packages/apps/Car/Provision" groups="pdk-fs" />
<project path="packages/apps/Car/Radio" name="platform/packages/apps/Car/Radio" groups="pdk-fs" />
@@ -1018,6 +1021,7 @@
<project path="packages/modules/ExtServices" name="platform/packages/modules/ExtServices" groups="pdk-cw-fs,pdk-fs" />
<project path="packages/modules/GeoTZ" name="platform/packages/modules/GeoTZ" groups="pdk-cw-fs,pdk-fs" />
<project path="packages/modules/Gki" name="platform/packages/modules/Gki" groups="pdk-cw-fs,pdk-fs" />
+ <project path="packages/modules/IntentResolver" name="platform/packages/modules/IntentResolver" groups="pdk" />
<project path="packages/modules/IPsec" name="platform/packages/modules/IPsec" groups="pdk" />
<project path="packages/modules/DnsResolver" name="platform/packages/modules/DnsResolver" groups="pdk-cw-fs,pdk-fs" />
<project path="packages/modules/Media" name="platform/packages/modules/Media" groups="pdk" />