From daed7671fb1fbdf08aee3696ce66ac92496fb473 Mon Sep 17 00:00:00 2001 From: satayev Date: Wed, 12 May 2021 16:44:08 +0100 Subject: [PATCH] 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: Idf501d35b631782d6c0b6eed6f6063cfb332d8e6 --- apex/appsearch/Android.bp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp index 87f65a9220047..c592d1305cd17 100644 --- a/apex/appsearch/Android.bp +++ b/apex/appsearch/Android.bp @@ -24,8 +24,8 @@ package { apex { name: "com.android.appsearch", manifest: "apex_manifest.json", + bootclasspath_fragments: ["com.android.appsearch-bootclasspath-fragment"], java_libs: [ - "framework-appsearch", "service-appsearch", ], key: "com.android.appsearch.key", @@ -45,3 +45,10 @@ android_app_certificate { // com.android.appsearch.pk8 (the private key) certificate: "com.android.appsearch", } + +// Encapsulate the contributions made by the com.android.appsearch to the bootclasspath. +bootclasspath_fragment { + name: "com.android.appsearch-bootclasspath-fragment", + contents: ["framework-appsearch"], + apex_available: ["com.android.appsearch"], +}