commit 6e54952b44c230fc17cf42aab1a218c08238ea3b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 03 19:20:14 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 03 19:20:14 2020 +0000
tree 8b7234145b49e079e7f0788e04849ec0e496cfaf
parent 9d4a90ef4bc8270fc52c075a34c007acd1b0a6c3
parent 8e28a17bfef9272879a026fb4e30b87413f107e6

Merge "Add Soong android_app and android_test modules to javac-check"

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 556d25a..b0a0e02 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -823,6 +823,12 @@
     merged_dict[key] = (
         "%s %s" %
         (framework_dict.get(key, ""), vendor_dict.get(key, ""))).strip()
+
+  # Pick virtual ab related flags from vendor dict, if defined.
+  if "virtual_ab" in vendor_dict.keys():
+     merged_dict["virtual_ab"] = vendor_dict["virtual_ab"]
+  if "virtual_ab_retrofit" in vendor_dict.keys():
+     merged_dict["virtual_ab_retrofit"] = vendor_dict["virtual_ab_retrofit"]
   return merged_dict