diff options
| author | Anton Hansson <hansson@google.com> | 2020-12-21 17:10:01 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-12-21 17:25:30 +0000 |
| commit | dff2c78a205d288526ee986b203a26af3e485075 (patch) | |
| tree | 8dfac681fcaa0ae0e6931c2a81963b80d0932ccd /java/java_test.go | |
| parent | 69c43e40add4edcae3cb2bdaed671a0151e78ad3 (diff) | |
Add attribute to disable last-api compat tracking
Setting this to true by default is dangerous as it can mask bugs. Create
a dedicated attribute for java_sdk_library to enable this behavior
instead. The default will be flipped in a future CL when all the current
offenders have been fixed.
Fix all the tests to have the right API files.
Bug: 176092454
Test: m nothing
Change-Id: Ieab94bcb74abf8d018365a56fb447fe3dbd46957
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/java_test.go b/java/java_test.go index f7cf03f4d..48d6062fd 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -83,12 +83,11 @@ func testContext(config android.Config) *android.TestContext { ctx.RegisterModuleType("python_binary_host", python.PythonBinaryHostFactory) RegisterDocsBuildComponents(ctx) RegisterStubsBuildComponents(ctx) + RegisterPrebuiltApisBuildComponents(ctx) RegisterSdkLibraryBuildComponents(ctx) ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators) ctx.PreArchMutators(android.RegisterComponentsMutator) - RegisterPrebuiltApisBuildComponents(ctx) - ctx.PreDepsMutators(python.RegisterPythonPreDepsMutators) ctx.PostDepsMutators(android.RegisterOverridePostDepsMutators) ctx.RegisterPreSingletonType("overlay", android.SingletonFactoryAdaptor(ctx.Context, OverlaySingletonFactory)) @@ -1813,7 +1812,7 @@ func TestJavaSdkLibrary(t *testing.T) { func TestJavaSdkLibrary_StubOrImplOnlyLibs(t *testing.T) { ctx, _ := testJava(t, ` java_sdk_library { - name: "sdk_lib", + name: "sdklib", srcs: ["a.java"], impl_only_libs: ["foo"], stub_only_libs: ["bar"], @@ -1830,13 +1829,13 @@ func TestJavaSdkLibrary_StubOrImplOnlyLibs(t *testing.T) { } `) - for _, implName := range []string{"sdk_lib", "sdk_lib.impl"} { + for _, implName := range []string{"sdklib", "sdklib.impl"} { implJavacCp := ctx.ModuleForTests(implName, "android_common").Rule("javac").Args["classpath"] if !strings.Contains(implJavacCp, "/foo.jar") || strings.Contains(implJavacCp, "/bar.jar") { t.Errorf("%v javac classpath %v does not contain foo and not bar", implName, implJavacCp) } } - stubName := apiScopePublic.stubsLibraryModuleName("sdk_lib") + stubName := apiScopePublic.stubsLibraryModuleName("sdklib") stubsJavacCp := ctx.ModuleForTests(stubName, "android_common").Rule("javac").Args["classpath"] if strings.Contains(stubsJavacCp, "/foo.jar") || !strings.Contains(stubsJavacCp, "/bar.jar") { t.Errorf("stubs javac classpath %v does not contain bar and not foo", stubsJavacCp) |