diff options
| author | 2020-12-21 17:10:01 +0000 | |
|---|---|---|
| committer | 2020-12-21 17:25:30 +0000 | |
| commit | dff2c78a205d288526ee986b203a26af3e485075 (patch) | |
| tree | 8dfac681fcaa0ae0e6931c2a81963b80d0932ccd /java/testing.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/testing.go')
| -rw-r--r-- | java/testing.go | 80 |
1 files changed, 27 insertions, 53 deletions
diff --git a/java/testing.go b/java/testing.go index ab1312178..fc4e4775b 100644 --- a/java/testing.go +++ b/java/testing.go @@ -39,59 +39,8 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string "api/test-current.txt": nil, "api/test-removed.txt": nil, - "prebuilts/sdk/14/public/android.jar": nil, - "prebuilts/sdk/14/public/framework.aidl": nil, - "prebuilts/sdk/14/system/android.jar": nil, - "prebuilts/sdk/17/public/android.jar": nil, - "prebuilts/sdk/17/public/framework.aidl": nil, - "prebuilts/sdk/17/system/android.jar": nil, - "prebuilts/sdk/28/public/android.jar": nil, - "prebuilts/sdk/28/public/framework.aidl": nil, - "prebuilts/sdk/28/system/android.jar": nil, - "prebuilts/sdk/29/public/android.jar": nil, - "prebuilts/sdk/29/public/framework.aidl": nil, - "prebuilts/sdk/29/system/android.jar": nil, - "prebuilts/sdk/29/system/foo.jar": nil, - "prebuilts/sdk/30/public/android.jar": nil, - "prebuilts/sdk/30/public/framework.aidl": nil, - "prebuilts/sdk/30/system/android.jar": nil, - "prebuilts/sdk/30/system/foo.jar": nil, - "prebuilts/sdk/30/module-lib/android.jar": nil, - "prebuilts/sdk/30/module-lib/foo.jar": nil, - "prebuilts/sdk/30/public/core-for-system-modules.jar": nil, - "prebuilts/sdk/current/core/android.jar": nil, - "prebuilts/sdk/current/public/android.jar": nil, - "prebuilts/sdk/current/public/framework.aidl": nil, - "prebuilts/sdk/current/public/core.jar": nil, - "prebuilts/sdk/current/public/core-for-system-modules.jar": nil, - "prebuilts/sdk/current/system/android.jar": nil, - "prebuilts/sdk/current/test/android.jar": nil, - "prebuilts/sdk/28/public/api/foo.txt": nil, - "prebuilts/sdk/28/system/api/foo.txt": nil, - "prebuilts/sdk/28/test/api/foo.txt": nil, - "prebuilts/sdk/28/public/api/foo-removed.txt": nil, - "prebuilts/sdk/28/system/api/foo-removed.txt": nil, - "prebuilts/sdk/28/test/api/foo-removed.txt": nil, - "prebuilts/sdk/28/public/api/bar.txt": nil, - "prebuilts/sdk/28/system/api/bar.txt": nil, - "prebuilts/sdk/28/test/api/bar.txt": nil, - "prebuilts/sdk/28/public/api/bar-removed.txt": nil, - "prebuilts/sdk/28/system/api/bar-removed.txt": nil, - "prebuilts/sdk/28/test/api/bar-removed.txt": nil, - "prebuilts/sdk/30/public/api/foo.txt": nil, - "prebuilts/sdk/30/system/api/foo.txt": nil, - "prebuilts/sdk/30/test/api/foo.txt": nil, - "prebuilts/sdk/30/public/api/foo-removed.txt": nil, - "prebuilts/sdk/30/system/api/foo-removed.txt": nil, - "prebuilts/sdk/30/test/api/foo-removed.txt": nil, - "prebuilts/sdk/30/public/api/bar.txt": nil, - "prebuilts/sdk/30/system/api/bar.txt": nil, - "prebuilts/sdk/30/test/api/bar.txt": nil, - "prebuilts/sdk/30/public/api/bar-removed.txt": nil, - "prebuilts/sdk/30/system/api/bar-removed.txt": nil, - "prebuilts/sdk/30/test/api/bar-removed.txt": nil, - "prebuilts/sdk/tools/core-lambda-stubs.jar": nil, - "prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"], imports_sdk_version: "none", imports_compile_dex:true,}`), + "prebuilts/sdk/tools/core-lambda-stubs.jar": nil, + "prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"], imports_sdk_version: "none", imports_compile_dex:true,}`), "bin.py": nil, python.StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%' @@ -104,6 +53,16 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string "api/system-server-removed.txt": nil, } + levels := []string{"14", "28", "29", "30", "current"} + libs := []string{ + "android", "foo", "bar", "sdklib", "barney", "betty", "foo-shared_library", + "foo-no_shared_library", "core-for-system-modules", "quuz", "qux", "fred", + "runtime-library", + } + for k, v := range prebuiltApisFilesForLibs(levels, libs) { + mockFS[k] = v + } + cc.GatherRequiredFilesForTest(mockFS) for k, v := range fs { @@ -121,6 +80,21 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string return config } +func prebuiltApisFilesForLibs(apiLevels []string, sdkLibs []string) map[string][]byte { + fs := make(map[string][]byte) + for _, level := range apiLevels { + for _, lib := range sdkLibs { + for _, scope := range []string{"public", "system", "module-lib", "system-server", "test"} { + fs[fmt.Sprintf("prebuilts/sdk/%s/%s/%s.jar", level, scope, lib)] = nil + fs[fmt.Sprintf("prebuilts/sdk/%s/%s/api/%s.txt", level, scope, lib)] = nil + fs[fmt.Sprintf("prebuilts/sdk/%s/%s/api/%s-removed.txt", level, scope, lib)] = nil + } + } + fs[fmt.Sprintf("prebuilts/sdk/%s/public/framework.aidl", level)] = nil + } + return fs +} + func GatherRequiredDepsForTest() string { var bp string |