diff options
| author | 2021-04-24 22:57:41 +0100 | |
|---|---|---|
| committer | 2021-04-26 22:04:14 +0000 | |
| commit | 0349b152f29a286d7365f17d0b21d735c71c39e3 (patch) | |
| tree | fefddb85f46100b5605cd348b6494d245844cbd1 | |
| parent | 8a70dd85c6beff0a434406769c7a2688f79ea6fe (diff) | |
Dedup art-bootclasspath-fragment contents from sdk
Previously, the sdk duplicated the modules from the contents list of
the art-bootclasspath-fragment. That is no longer necessary as the
contents of bootclasspath_fragment modules are automatically added to
the sdk.
Bug: 177892522
Test: m art-module-sdk
- check generated snapshot still contains core-oj, core-libart,
etc.
Change-Id: I1a8720ff41981f31595a5d2d30164afd0a3a5764
| -rw-r--r-- | build/sdk/Android.bp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/build/sdk/Android.bp b/build/sdk/Android.bp index db4ec34aee..a0f11edc3c 100644 --- a/build/sdk/Android.bp +++ b/build/sdk/Android.bp @@ -84,6 +84,7 @@ art_module_sdk { android: { bootclasspath_fragments: [ + // Adds the fragment and its contents to the sdk. "art-bootclasspath-fragment", ], @@ -91,20 +92,6 @@ art_module_sdk { "libcore-platform-compat-config", ], - // Create placeholder java_import prebuilts for the java boot libraries so that Soong - // can retrieve their dex implementation jars from the associated prebuilt_apex. All - // libraries listed in the exported_java_libs property of the ART apex (see - // packages/modules/ArtPrebuilt) must have a prebuilt provided by this sdk or one of - // the ART module_exports. Those java boot libraries which do not require a prebuilt for - // another reason, e.g. test, are listed here. - java_boot_libs: [ - "apache-xml", - "bouncycastle", - "core-libart", - "core-oj", - "okhttp", - ], - java_header_libs: [ // Needed by any module that builds against any non-numeric // sdk_version other than "none". |