commit acd8beb0aa1a364e453d14d4a04ba3006c4aa659
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Feb 12 16:02:19 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 12 16:02:19 2025 -0800
tree 88144fc13fdeed76eb465fe4e962249d1687456e
parent 7b17361d8dff0252d9fdea521f16c6ad194cd4ac
parent 82eb7ac553d00b5c43cad32175c8a8ceb7e9a861

Merge "Declare inputs of $PRODUCT_OUT/system_server.zip" into main

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index dcd654d..c68fd1e 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -485,6 +485,8 @@
   $(call add_json_str, ProductVirtualAbCompressionFactor, $(PRODUCT_VIRTUAL_AB_COMPRESSION_FACTOR))
   $(call add_json_str, ProductVirtualAbCowVersion, $(PRODUCT_VIRTUAL_AB_COW_VERSION))
   $(call add_json_bool, AbOtaUpdater, $(filter true,$(AB_OTA_UPDATER)))
+  $(call add_json_list, AbOtaPartitions, $(AB_OTA_PARTITIONS))
+  $(call add_json_list, AbOtaKeys, $(PRODUCT_OTA_PUBLIC_KEYS))
 
   # Avb (android verified boot) stuff
   $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))

teams/Android.bp

diff --git a/teams/Android.bp b/teams/Android.bp
index 7e0795f..8689267 100644
--- a/teams/Android.bp
+++ b/teams/Android.bp
@@ -931,7 +931,7 @@
 }
 
 team {
-    name: "trendy_team_camerax",
+    name: "trendy_team_android_camera_innovation_team",
 
     // go/trendy/manage/engineers/5272590669479936
     trendy_team_id: "5272590669479936",