DO NOT MERGE - Merge Pie Bonito/Sargo into master.

Bug: 131756210
Change-Id: I97892fee5b7a68ce3cc13262fce076c11733b2b4

2 files changed, 19 insertions, 2 deletions

diff --git a/aosp-master-with-phones.xml b/aosp-master-with-phones.xml
index 7151e250a..dd2dcaa49 100644
--- a/aosp-master-with-phones.xml
+++ b/aosp-master-with-phones.xml
@@ -15,19 +15,23 @@
   <include name="default.xml" />
 
   <project path="vendor/google_devices/blueline" name="platform/vendor/aosp/google_devices/blueline" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/bonito" name="platform/vendor/aosp/google_devices/bonito" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/crosshatch" name="platform/vendor/aosp/google_devices/crosshatch" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/marlin" name="platform/vendor/aosp/google_devices/marlin" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/muskie" name="platform/vendor/aosp/google_devices/muskie" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/sailfish" name="platform/vendor/aosp/google_devices/sailfish" groups="vendor" remote="goog" />
+  <project path="vendor/google_devices/sargo" name="platform/vendor/aosp/google_devices/sargo" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/taimen" name="platform/vendor/aosp/google_devices/taimen" groups="vendor" remote="goog" />
   <project path="vendor/google_devices/walleye" name="platform/vendor/aosp/google_devices/walleye" groups="vendor" remote="goog" />
   <project path="vendor/google/security" name="platform/vendor/google/security" groups="vendor" remote="goog" />
   <project path="vendor/google/tools" name="platform/vendor/google/tools" groups="vendor" remote="goog" />
   <project path="vendor/linaro/hikey960" name="platform/vendor/aosp/linaro/hikey960" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/bonito" name="platform/vendor/aosp/qcom/bonito" groups="vendor" remote="goog" />
   <project path="vendor/qcom/blueline" name="platform/vendor/aosp/qcom/blueline" groups="vendor" remote="goog" />
   <project path="vendor/qcom/crosshatch" name="platform/vendor/aosp/qcom/crosshatch" groups="vendor" remote="goog" />
   <project path="vendor/qcom/marlin" name="platform/vendor/aosp/qcom/marlin" groups="vendor" remote="goog" />
   <project path="vendor/qcom/sailfish" name="platform/vendor/aosp/qcom/sailfish" groups="vendor" remote="goog" />
+  <project path="vendor/qcom/sargo" name="platform/vendor/aosp/qcom/sargo" groups="vendor" remote="goog" />
   <project path="vendor/qcom/taimen" name="platform/vendor/aosp/qcom/taimen" groups="vendor" remote="goog" />
   <project path="vendor/qcom/walleye" name="platform/vendor/aosp/qcom/walleye" groups="vendor" remote="goog" />
   # Test change
diff --git a/default.xml b/default.xml
index 5f68a0102..264890920 100644
--- a/default.xml
+++ b/default.xml
@@ -53,6 +53,9 @@
   <project path="device/generic/x86" name="device/generic/x86" groups="pdk" />
   <project path="device/generic/x86_64" name="device/generic/x86_64" groups="pdk" />
   <project path="device/google/atv" name="device/google/atv" groups="device,broadcom_pdk,generic_fs,pdk" />
+  <project path="device/google/bonito" name="device/google/bonito" groups="device,bonito" />
+  <project path="device/google/bonito-kernel" name="device/google/bonito-kernel" groups="device,bonito" clone-depth="1" />
+  <project path="device/google/bonito-sepolicy" name="device/google/bonito-sepolicy" groups="device,bonito" />
   <project path="device/google/contexthub" name="device/google/contexthub" groups="device,marlin,pdk" />
   <project path="device/google/crosshatch" name="device/google/crosshatch" groups="device,crosshatch" />
   <project path="device/google/crosshatch-kernel" name="device/google/crosshatch-kernel" groups="device,crosshatch" clone-depth="1" />
@@ -465,9 +468,10 @@
   <project path="hardware/broadcom/libbt" name="platform/hardware/broadcom/libbt" groups="pdk" />
   <project path="hardware/broadcom/wlan" name="platform/hardware/broadcom/wlan" groups="pdk,broadcom_wlan" />
   <project path="hardware/google/apf" name="platform/hardware/google/apf" groups="pdk" />
+  <project path="hardware/google/av" name="platform/hardware/google/av" groups="pdk" />
   <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/av" name="platform/hardware/google/av" groups="pdk" />
+  <project path="hardware/google/pixel" name="platform/hardware/google/pixel" groups="bonito,crosshatch" />
   <project path="hardware/interfaces" name="platform/hardware/interfaces" groups="pdk" />
   <project path="hardware/invensense" name="platform/hardware/invensense" groups="invensense,pdk" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" groups="pdk" />
@@ -492,6 +496,16 @@
   <project path="hardware/qcom/msm8x27" name="platform/hardware/qcom/msm8x27" groups="qcom_msm8x27,pdk-qcom" />
   <project path="hardware/qcom/msm8x84" name="platform/hardware/qcom/msm8x84" groups="qcom_msm8x84,pdk-qcom" />
   <project path="hardware/qcom/neuralnetworks/hvxservice" name="platform/hardware/qcom/neuralnetworks/hvxservice" groups="wahoo" />
+  <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom" />
+  <project path="hardware/qcom/sdm710/data/ipacfg-mgr" name="platform/hardware/qcom/sdm710/data/ipacfg-mgr" groups="vendor,qcom_sdm710" />
+  <project path="hardware/qcom/sdm710/display" name="platform/hardware/qcom/sdm710/display" groups="qcom_sdm710" >
+    <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm710/Android.mk" />
+    <linkfile src="os_pickup.bp" dest="hardware/qcom/sdm710/Android.bp" />
+  </project>
+  <project path="hardware/qcom/sdm710/gps" name="platform/hardware/qcom/sdm710/gps" groups="qcom_sdm710" />
+  <project path="hardware/qcom/sdm710/media" name="platform/hardware/qcom/sdm710/media" groups="qcom_sdm710" />
+  <project path="hardware/qcom/sdm710/thermal" name="platform/hardware/qcom/sdm710/thermal" groups="qcom_sdm710" />
+  <project path="hardware/qcom/sdm710/vr" name="platform/hardware/qcom/sdm710/vr" groups="qcom_sdm710" />
   <project path="hardware/qcom/sdm845/bt" name="platform/hardware/qcom/sdm845/bt" groups="qcom_sdm845" />
   <project path="hardware/qcom/sdm845/data/ipacfg-mgr" name="platform/hardware/qcom/sdm845/data/ipacfg-mgr" groups="vendor,qcom_sdm845" >
     <linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk" />
@@ -502,7 +516,6 @@
   <project path="hardware/qcom/sdm845/media" name="platform/hardware/qcom/sdm845/media" groups="qcom_sdm845" />
   <project path="hardware/qcom/sdm845/thermal" name="platform/hardware/qcom/sdm845/thermal" groups="qcom_sdm845" />
   <project path="hardware/qcom/sdm845/vr" name="platform/hardware/qcom/sdm845/vr" groups="qcom_sdm845" />
-  <project path="hardware/qcom/power" name="platform/hardware/qcom/power" groups="qcom,pdk-qcom" />
   <project path="hardware/qcom/wlan" name="platform/hardware/qcom/wlan" groups="qcom_wlan,pdk-qcom" />
   <project path="hardware/ril" name="platform/hardware/ril" groups="pdk" />
   <project path="hardware/st/nfc" name="platform/hardware/st/nfc" groups="pdk" />