summaryrefslogtreecommitdiff
path: root/java/bootclasspath_fragment_test.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-06-30 18:25:36 +0100
committerOrion Hodson <oth@google.com>2021-07-01 14:27:42 +0100
commit58423878328d3e1e126b4473e786c18f03e9c0e2 (patch)
tree5ba8a1346e7735558cfa58537580c610a6145a2f /java/bootclasspath_fragment_test.go
parentfee8cf36e3f5c3280b470c8829c9f9a9d4594337 (diff)
Support using java_sdk_library components in stub_libs
Previously, if a bootclasspath_fragment had both a java_sdk_library module and one of its components in stub_libs properties they would be treated as separate modules instead of simply different APIs from the same module. That would result in them both providing stub dex jars to "hiddenapi list" which would fail because it found duplicate definitions of the same class. e.g. Specifying something like this: api: { stub_libs: [ "art.module.public.api", ], }, core_platform_api: { stub_libs: [ "art.module.public.api.stubs.module_lib", ], }, would cause "hiddenapi list" to fail because it would have been passed paths to two dex jars (actually the same dex jar but that does not matter) each of which defined the same class, e.g. java.lang.Object. This change treats the "art.module.public.api.stubs.module_lib" and "art.module.public.api" modules as being the same for the purposes of hidden API processing. (cherry picked from commit 3f0290ef7940c70a491dcbd4b57cabd8b2e753ef) Bug: 192446466 Test: m nothing Merged-In: I9de96337f64f26e24cff040d4bbed9eecc67b1ed Change-Id: I9e1cb82bea96022faaec98edc0c9ea7eac6204b0
Diffstat (limited to 'java/bootclasspath_fragment_test.go')
-rw-r--r--java/bootclasspath_fragment_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/bootclasspath_fragment_test.go b/java/bootclasspath_fragment_test.go
index b46988636..3d0e1558f 100644
--- a/java/bootclasspath_fragment_test.go
+++ b/java/bootclasspath_fragment_test.go
@@ -197,7 +197,7 @@ func TestBootclasspathFragment_StubLibs(t *testing.T) {
],
},
core_platform_api: {
- stub_libs: ["mycoreplatform"],
+ stub_libs: ["mycoreplatform.stubs"],
},
}