From f14149e81a23a4c2a2b3c14326d16a6aac3ec049 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Wed, 12 May 2021 17:11:50 +0100
Subject: [PATCH] Add bootclasspath_fragments to platform-bootclasspath.

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

diff --git a/boot/Android.bp b/boot/Android.bp
index 3caede47d8591..e8d88a531b5b1 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -47,14 +47,58 @@ platform_bootclasspath {
     // The bootclasspath_fragments that contribute to the platform
     // bootclasspath.
     fragments: [
+        {
+            apex: "com.android.appsearch",
+            module: "com.android.appsearch-bootclasspath-fragment",
+        },
         {
             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.scheduling",
+            module: "com.android.scheduling-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.