commit 4c0cad95c26a004f78ba80382c69e4522a69700f
author Treehugger Robot <treehugger-gerrit@google.com> Thu May 13 13:08:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 13:08:39 2021 +0000
tree 8dce951a281e7962b36b0fb45a4329b2d8a8e6f8
parent 8dd7c8e625fe2af02ab9ce747c34ff544c294fbe
parent 70bb5cb9cc18402c8608af27d8fe5b1ccd1e8233

Merge "Add bootclasspath_fragment." am: 27b3662fc3 am: 70bb5cb9cc

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1705377

Change-Id: Ia36b1c15e76ff449d1208c12d907102f46a713c5

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index 9dd5300..a907ab6 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -19,7 +19,7 @@
     name: "com.android.mediaprovider-defaults",
     updatable: true,
     min_sdk_version: "30",
-    java_libs: ["framework-mediaprovider"],
+    bootclasspath_fragments: ["com.android.mediaprovider-bootclasspath-fragment"],
     key: "com.android.mediaprovider.key",
     certificate: ":com.android.mediaprovider.certificate",
     file_contexts: ":com.android.mediaprovider-file_contexts",
@@ -45,3 +45,10 @@
         "framework-mediaprovider",
     ],
 }
+
+// Encapsulate the contributions made by the com.android.mediaprovider to the bootclasspath.
+bootclasspath_fragment {
+    name: "com.android.mediaprovider-bootclasspath-fragment",
+    contents: ["framework-mediaprovider"],
+    apex_available: ["com.android.mediaprovider"],
+}