From e19115dabdd46c9d173c34947cd1d3f8f5f9b395 Mon Sep 17 00:00:00 2001
From: Artur Satayev <satayev@google.com>
Date: Tue, 25 May 2021 16:46:33 +0000
Subject: [PATCH] Revert "Revert "Add bootclasspath_fragments to
 platform-bootclas..."

Revert submission 14717811-revert-populate-platform-bootclasspath

Reason for revert: retry with a fix
Reverted Changes:
Ib58cd0211:Revert "Add bootclasspath_fragments to platform-bo...
I13b622d6c:Partial Revert "Populate individual classpath_frag...

Bug: 180105615
Test: atest sdkextensions_e2e_tests

Change-Id: Ic391fa4035f868b1ef92f5b275dad0ac5b1ab462
---
 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.