From 9e441acd279d0adda3a258b4918cce9bfd8a9f18 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 11 May 2021 19:26:59 +0100
Subject: [PATCH] Add bootclasspath_fragments to platform-bootclasspath.

Bug: 180105615
Test: atest CtsClasspathsTestCases
Merged-In: I72c76685d337c683b79ccd38c8f3b91816e34102
Change-Id: If7c115f3fc39b908ee809d7734fad8c387f05ab7
---
 boot/Android.bp | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/boot/Android.bp b/boot/Android.bp
index 3caede47d8591..09cd0d4b6fe6a 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -51,10 +51,46 @@ platform_bootclasspath {
             apex: "com.android.art",
             module: "art-bootclasspath-fragment",
         },
+        {
+            apex: "com.android.conscrypt",
+            module: "com.android.conscrypt-bootclasspath-fragment",
+        },
         {
             apex: "com.android.i18n",
             module: "i18n-bootclasspath-fragment",
         },
+        {
+            apex: "com.android.ipsec",
+            module: "com.android.ipsec-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.media",
+            module: "com.android.media-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.mediaprovider",
+            module: "com.android.mediaprovider-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.os.statsd",
+            module: "com.android.os.statsd-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.permission",
+            module: "com.android.permission-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.sdkext",
+            module: "com.android.sdkext-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.tethering",
+            module: "com.android.tethering-bootclasspath-fragment",
+        },
+        {
+            apex: "com.android.wifi",
+            module: "com.android.wifi-bootclasspath-fragment",
+        },
     ],
 
     // Additional information needed by hidden api processing.