commit cf64ba4a9a979cd8e0cc0a1158d011c5a497b4d9
author Xin Li <delphij@google.com> Wed Oct 06 22:52:55 2021 +0000
committer Xin Li <delphij@google.com> Wed Oct 06 22:52:55 2021 +0000
tree f73c423195b964256cceacafd974cea4c047611b
parent a04d03b0549c70947dfa65b2f2ed06252731503e
parent 3aecb65ce6469517ba48ca5926bb9d4f5191e2e9

Merge Android 12

Bug: 202323961
Merged-In: I085779d4c45ba8e6593fa22dde6548b96a84c24d
Change-Id: I06d2587dc7d1ab261c16ad97b74fd79a52b8a9eb

Android.bp

diff --git a/Android.bp b/Android.bp
index eda527f..4e7927f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,6 +147,7 @@
     visibility: [
         "//build/make/tools/signapk",
         "//tools/apksig",
+        "//vendor:__subpackages__",
     ],
     defaults: ["conscrypt_global"],
 

apex/apex_manifest.json

diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 14d81ea..e59fbcf 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.conscrypt",
-  "version": 300000000
+  "version": 319999900
 }