commit 2dc59d94234ace4a80f5fe33d4b2351435b50be9
author Pete Bentley <prb@google.com> Wed Jan 25 20:36:44 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 25 20:36:44 2023 +0000
tree 97683a30fb986135d2c186baac816e5abff2a98b
parent 264ba23f54655b3377c8f872b559e572dfdf928a
parent cd3a5be8cf1f2a2ad4b145b68ea6100d7f5fe93f

[automerger skipped] [DO NOT MERGE] Ignore MetricsTest on CTS 12. am: db2765c9cf -s ours am: 991a7778f7 -s ours am: d0ab0483cb -s ours am: cd3a5be8cf -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2359220

Change-Id: I23c3459ad24bf84da9e7aa74b4459e84e8fb09ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index fe105ea..9cbe10d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -263,8 +263,14 @@
 
     target: {
         // boringssl_self_test needed in both /system/bin and /apex/com.android.conscrypt/bin
+        // prng_seeder is only needed in /system/bin
+        // The required directive is here rather than under boringssl to avoid circular
+        // dependencies.
         android: {
-            required: ["boringssl_self_test"],
+            required: [
+                "boringssl_self_test",
+                "prng_seeder",
+            ],
         },
     },
 

apex/apex_manifest.json

diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index 9584d95..82b8927 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.conscrypt",
-  "version": 339990000
+  "version": 330400000
 }