commit 0d0f4b3df62cf96f17e40469cabbd7cab97ac6fb
author Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 18 14:18:43 2022 +0000
committer mdb:android-git <superproject-auto-update@invalid> Tue Jan 18 14:18:50 2022 +0000
tree 46710f0dc252c9e16153f40ee4ac7d957069a78f
parent d977b84b80d97a19a93f97d7ead673626bd513a3

Merge changes Ib1a1d1bb,If0362c6d,I6018791a,Id81c93ea,I7704a884, ...

* changes:
  Create a filegroup for public stub sources
  Minor refactorings in api.go
  Convert merged module lib stub to api.go
  Some minor tweaks for api.go
  Temporarily add support for conditional modules
  Construct sdk-annotations.zip programmatically
  Replace manual genrule modules with combined_apis

frameworks/base

diff --git a/frameworks/base b/frameworks/base
index a312a96..7e22670 160000
--- a/frameworks/base
+++ b/frameworks/base
@@ -1 +1 @@
-Subproject commit a312a961e0446f71833c1fce60c330ba629e670c
+Subproject commit 7e226700a5babf64f4bbf65d0fcc6e9d0c0f3fad