From fee79d32ce31def91b4053ba8cbc00b37ad86df6 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 12 May 2021 15:42:54 +0100
Subject: Add bootclasspath_fragment.

Note that the contents of the bootclasspath_fragment are added as
dependencies to an apex, so there is no need to duplicate them in
java_libs.

Bug: 180105615
Test: atest CtsClasspathsTestCases
Change-Id: I2c4cfe587ad4b3d459c3610bbf3928fb2f8ccea7
---
 Android.bp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'Android.bp')

diff --git a/Android.bp b/Android.bp
index 9ddbfc219..cdbe47812 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,13 +26,10 @@ apex_defaults {
     name: "com.android.permission-defaults",
     updatable: true,
     min_sdk_version: "30",
+    bootclasspath_fragments: ["com.android.permission-bootclasspath-fragment"],
     key: "com.android.permission.key",
     certificate: ":com.android.permission.certificate",
-    java_libs: [
-        "framework-permission",
-        "framework-permission-s",
-        "service-permission",
-    ],
+    java_libs: ["service-permission"],
     apps: ["PermissionController"],
 }
 
@@ -59,3 +56,13 @@ sdk {
         "framework-permission-s",
     ],
 }
+
+// Encapsulate the contributions made by the com.android.permission to the bootclasspath.
+bootclasspath_fragment {
+    name: "com.android.permission-bootclasspath-fragment",
+    contents: [
+      "framework-permission",
+      "framework-permission-s",
+    ],
+    apex_available: ["com.android.permission"],
+}
-- 
cgit v1.2.3-59-g8ed1b