commit eefe780f6f9965e77c4df82433ad8088d9066682
author Paul Duffin <paulduffin@google.com> Thu Jun 17 06:36:43 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 17 06:36:43 2021 +0000
tree d5499e520609b579e6be73213a27007c02a39215
parent 43210ea116b33404a4669d031aae19f2f5f044fa
parent 27dfefcaa9ddf6c6f1f64f48e459824f990d2193

Merge "Support building against prebuilt conscrypt and i18n modules"

mainline/conscrypt/apex/Android.bp

diff --git a/mainline/conscrypt/apex/Android.bp b/mainline/conscrypt/apex/Android.bp
index 5fe1151..67e2961 100644
--- a/mainline/conscrypt/apex/Android.bp
+++ b/mainline/conscrypt/apex/Android.bp
@@ -35,4 +35,11 @@
         },
     },
     filename: "com.android.conscrypt.apex",
+
+    // Make fragment related files from the apex file available for use by the
+    // build when using prebuilts, e.g. for running the boot jars package check
+    // and hidden API flag validation among other uses.
+    exported_bootclasspath_fragments: [
+        "com.android.conscrypt-bootclasspath-fragment",
+    ],
 }

mainline/i18n/apex/Android.bp

diff --git a/mainline/i18n/apex/Android.bp b/mainline/i18n/apex/Android.bp
index 497add7..f7cbfe1 100644
--- a/mainline/i18n/apex/Android.bp
+++ b/mainline/i18n/apex/Android.bp
@@ -40,4 +40,11 @@
         },
     },
     filename: "com.android.i18n.apex",
+
+    // Make fragment related files from the apex file available for use by the
+    // build when using prebuilts, e.g. for running the boot jars package check
+    // and hidden API flag validation among other uses.
+    exported_bootclasspath_fragments: [
+        "i18n-bootclasspath-fragment",
+    ],
 }