commit 293389ce3b86985d1becf9d29b50e926dd4a3ba1
author Shao-Chuan Lee <shaochuan@chromium.org> Fri Jan 20 17:44:35 2023 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 13 03:07:11 2023 +0000
tree 73014ffe40516ff012db10a47c12faf52a26bd40
parent b57a7eb64db4af6bbdf9ea185a180373129e033c

android: plumb Android branch via LKGB

- WriteLKGB takes Android branch as an optional param; branch info is
  included in the generated LKGB file.
- uprev_android_lkgb (called by PUpr) reads the branch info from LKGB
  and sends it down to cros_mark_android_as_stable.

BUG=b:259008604
TEST=./run_tests
TEST=./api/contrib/gen_call_scripts; ./api/contrib/call_scripts/android__write_lkgb

Change-Id: I19b2ef4700459f162266f9ebf0297fdfb57e26ef
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4600548
Reviewed-by: Gilberto Contreras <gcontreras@google.com>
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>

api/controller/android.py

diff --git a/api/controller/android.py b/api/controller/android.py
index faeb29b..ab8111f 100644
--- a/api/controller/android.py
+++ b/api/controller/android.py
@@ -147,6 +147,10 @@
 def WriteLKGB(input_proto, output_proto, _config):
     android_package = input_proto.android_package
     android_version = input_proto.android_version
+    android_branch = (
+        input_proto.android_branch
+        or android.GetAndroidBranchForPackage(android_package)
+    )
     android_package_dir = android.GetAndroidPackageDir(android_package)
 
     # Attempt to read current LKGB, if available.
@@ -171,7 +175,9 @@
         )
 
     lkgb = android.LKGB(
-        build_id=android_version, runtime_artifacts_pin=runtime_artifacts_pin
+        build_id=android_version,
+        branch=android_branch,
+        runtime_artifacts_pin=runtime_artifacts_pin,
     )
 
     # Do nothing if LKGB is already set to the requested version.