diff options
| author | 2024-01-12 23:50:37 +0000 | |
|---|---|---|
| committer | 2024-01-12 23:50:37 +0000 | |
| commit | 7e9343b889d72890f1dfa375529710defc577388 (patch) | |
| tree | 3b1fee5c1f356b894a73e9145e94aef15aed0156 /java/sdk_library_test.go | |
| parent | 404fb4e40b28893eea07c88e9cea6076003eb92b (diff) | |
| parent | f55a5f7b3732b79ad28a0ad7403fda5938e75db6 (diff) | |
Merge changes from topic "hiddenapi_exportable" into main
* changes:
Copy exportable artifacts to module sdk snapshot
Enable hiddenapi check for exportable stubs
Add defaults support for bootclasspath_fragment module type
Diffstat (limited to 'java/sdk_library_test.go')
| -rw-r--r-- | java/sdk_library_test.go | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/java/sdk_library_test.go b/java/sdk_library_test.go index c14f3e611..3326ec575 100644 --- a/java/sdk_library_test.go +++ b/java/sdk_library_test.go @@ -38,6 +38,11 @@ func TestJavaSdkLibrary(t *testing.T) { android.FixtureModifyConfig(func(config android.Config) { config.SetApiLibraries([]string{"foo"}) }), + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.BuildFlags = map[string]string{ + "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", + } + }), ).RunTestWithBp(t, ` droiddoc_exported_dir { name: "droiddoc-templates-sdk", @@ -139,6 +144,9 @@ func TestJavaSdkLibrary(t *testing.T) { "foo.api.public.latest", "foo.api.system.latest", "foo.stubs", + "foo.stubs.exportable", + "foo.stubs.exportable.system", + "foo.stubs.exportable.test", "foo.stubs.source", "foo.stubs.source.system", "foo.stubs.source.test", @@ -529,6 +537,11 @@ func TestJavaSdkLibrary_Deps(t *testing.T) { prepareForJavaTest, PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("sdklib"), + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.BuildFlags = map[string]string{ + "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", + } + }), ).RunTestWithBp(t, ` java_sdk_library { name: "sdklib", @@ -547,6 +560,7 @@ func TestJavaSdkLibrary_Deps(t *testing.T) { `sdklib.api.public.latest`, `sdklib.impl`, `sdklib.stubs`, + `sdklib.stubs.exportable`, `sdklib.stubs.source`, `sdklib.xml`, }) @@ -919,6 +933,11 @@ func TestJavaSdkLibraryImport_WithSource(t *testing.T) { prepareForJavaTest, PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("sdklib"), + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.BuildFlags = map[string]string{ + "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", + } + }), ).RunTestWithBp(t, ` java_sdk_library { name: "sdklib", @@ -945,6 +964,7 @@ func TestJavaSdkLibraryImport_WithSource(t *testing.T) { `sdklib.api.public.latest`, `sdklib.impl`, `sdklib.stubs`, + `sdklib.stubs.exportable`, `sdklib.stubs.source`, `sdklib.xml`, }) @@ -966,6 +986,11 @@ func testJavaSdkLibraryImport_Preferred(t *testing.T, prefer string, preparer an PrepareForTestWithJavaSdkLibraryFiles, FixtureWithLastReleaseApis("sdklib"), preparer, + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + variables.BuildFlags = map[string]string{ + "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", + } + }), ).RunTestWithBp(t, ` java_sdk_library { name: "sdklib", @@ -1018,6 +1043,7 @@ func testJavaSdkLibraryImport_Preferred(t *testing.T, prefer string, preparer an `sdklib.api.public.latest`, `sdklib.impl`, `sdklib.stubs`, + `sdklib.stubs.exportable`, `sdklib.stubs.source`, `sdklib.xml`, }) |