commit bbce7e49052d4a5cc58631bcee56b954e897f83a
author Michael Mortensen <mmortensen@google.com> Fri May 01 15:03:49 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Tue May 05 05:33:09 2020 +0000
tree 46a6dafa9097987f9e03808e12eb15dff407ef7c
parent 8f6c632bfd85e7385bf6fd7a201d2c89329508c7

Add GetBuilderMetadata fields for android target metadata.

These fields can be added without adding new service methods.

BUG=chromium:1071620
TEST=manual, run_tests

Change-Id: Id6c85fece6d69a3b0a9599aa6058b288badca4d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2175526
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
Tested-by: Michael Mortensen <mmortensen@google.com>

api/controller/packages.py

diff --git a/api/controller/packages.py b/api/controller/packages.py
index 26c6247..ffb9542 100644
--- a/api/controller/packages.py
+++ b/api/controller/packages.py
@@ -17,6 +17,7 @@
 from chromite.lib import constants
 from chromite.lib import cros_build_lib
 from chromite.lib import cros_logging as logging
+from chromite.lib import portage_util
 from chromite.lib.uprev_lib import GitRef
 from chromite.service import packages
 
@@ -212,6 +213,25 @@
   build_target = controller_util.ParseBuildTarget(input_proto.build_target)
   build_target_metadata = output_proto.build_target_metadata.add()
   build_target_metadata.build_target = build_target.name
+  # Android version.
+  android_version = packages.determine_android_version([build_target])
+  logging.info('Found android version: %s', android_version)
+  if android_version:
+    build_target_metadata.android_container_version = android_version
+  # Android branch version.
+  android_branch_version = packages.determine_android_branch(build_target)
+  logging.info('Found android branch version: %s', android_branch_version)
+  if android_branch_version:
+    build_target_metadata.android_container_branch = android_branch_version
+  # Android target version.
+  android_target_version = packages.determine_android_target(build_target)
+  logging.info('Found android target version: %s', android_target_version)
+  if android_target_version:
+    build_target_metadata.android_container_target = android_target_version
+
+  build_target_metadata.arc_use_set = 'arc' in portage_util.GetBoardUseFlags(
+      build_target.name)
+
   # TODO(crbug/1071620): Add service layer calls to fill out the rest of
   # build_target_metadata and model_metadata.