From 7ceaad1de07ddc61a6c31c09e50cd396eb905442 Mon Sep 17 00:00:00 2001 From: Mårten Kongstad Date: Mon, 3 Mar 2025 09:10:01 +0100 Subject: Always allow mixing old and new SDK version formats The SDK is changing its versioning scheme from the old single integer API level to the new major.minor format. Remove the now obsolete allow_incremental_platform_api property of prebuilt_apis. Update soong to allow a mix of the old and new formats. Bug: 397644338 Test: croot build/soong && go test ./java Test: lunch sdk-next-eng && m sdk dist Ignore-AOSP-First: minor SDK development takes place on internal main Change-Id: Ie169addb97bb1c45fb254f9a7922a623cda94289 --- java/testing.go | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'java/testing.go') diff --git a/java/testing.go b/java/testing.go index d7878d68d..82dbcee89 100644 --- a/java/testing.go +++ b/java/testing.go @@ -236,29 +236,6 @@ func FixtureWithPrebuiltApisAndExtensions(apiLevel2Modules map[string][]string, ) } -func FixtureWithPrebuiltIncrementalApis(apiLevel2Modules map[string][]string) android.FixturePreparer { - mockFS := android.MockFS{} - path := "prebuilts/sdk/Android.bp" - - bp := fmt.Sprintf(` - prebuilt_apis { - name: "sdk", - api_dirs: ["%s"], - allow_incremental_platform_api: true, - imports_sdk_version: "none", - imports_compile_dex: true, - } - `, strings.Join(android.SortedKeys(apiLevel2Modules), `", "`)) - - for release, modules := range apiLevel2Modules { - mockFS.Merge(prebuiltApisFilesForModules([]string{release}, modules)) - } - return android.GroupFixturePreparers( - android.FixtureAddTextFile(path, bp), - android.FixtureMergeMockFs(mockFS), - ) -} - func prebuiltApisFilesForModules(apiLevels []string, modules []string) map[string][]byte { libs := append([]string{"android"}, modules...) -- cgit v1.2.3-59-g8ed1b