diff options
| author | 2018-10-19 13:46:09 +0900 | |
|---|---|---|
| committer | 2019-01-16 22:00:17 -0800 | |
| commit | 054b19a1312606226cd3c3664ce50616d0306569 (patch) | |
| tree | 773980d8181d101d495de44343ea255d93c49b7d /java/java_test.go | |
| parent | 63d91fad6a565c4be99ca0af6f9b8581a12354c7 (diff) | |
Support core library
To support core library, "Openjdk9", "No_standard_libs" and metalava
properties are added to java_sdk_library.
If core_lib is true, dist paths are changed to
apistubs/core/....
impl library name is changed to {module_name}.jar instead of
{module_name}.impl.jar
Bug: 110404779
Test: m -j
Change-Id: Ieb6248ea714b4260333d8bf61573d4f3413f7f24
Merged-In: Ieb6248ea714b4260333d8bf61573d4f3413f7f24
(cherry picked from commit af4907fed798aa736d3d20f5439ba87be7ab0f10)
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/java_test.go b/java/java_test.go index 570efb70c..7a37b7b93 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -861,7 +861,6 @@ func TestJavaSdkLibrary(t *testing.T) { ctx.ModuleForTests("foo"+sdkDocsSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkSystemApiSuffix, "android_common") ctx.ModuleForTests("foo"+sdkDocsSuffix+sdkTestApiSuffix, "android_common") - ctx.ModuleForTests("foo"+sdkImplLibrarySuffix, "android_common") ctx.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") ctx.ModuleForTests("foo.api.public.28", "") ctx.ModuleForTests("foo.api.system.28", "") @@ -874,9 +873,9 @@ func TestJavaSdkLibrary(t *testing.T) { "foo.stubs.system.jar") } // ... and not to the impl lib - if strings.Contains(bazJavac.Args["classpath"], "foo.impl.jar") { + if strings.Contains(bazJavac.Args["classpath"], "foo.jar") { t.Errorf("baz javac classpath %v should not contain %q", bazJavac.Args["classpath"], - "foo.impl.jar") + "foo.jar") } // test if baz is not linked to the system variant of foo if strings.Contains(bazJavac.Args["classpath"], "foo.stubs.jar") { |