StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak logic for when extension txt is latest"

Browse Source
This commit is contained in:
Anton Hansson
2022-09-23 10:11:56 +00:00
committed by Gerrit Code Review
parent 2b8dcb4475 7212dbef03
commit f419277cc5
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/prebuilt_apis.go
View File

@@ -255,14 +255,13 @@ func prebuiltApiFiles(mctx android.LoadHookContext, p *prebuiltApis) {
if p.properties.Extensions_dir != nil { if p.properties.Extensions_dir != nil {
extensionApiFiles := globExtensionDirs(mctx, p, "api/*.txt") extensionApiFiles := globExtensionDirs(mctx, p, "api/*.txt")
for k, v := range getLatest(extensionApiFiles) { for k, v := range getLatest(extensionApiFiles) {
if v.version > mctx.Config().PlatformBaseSdkExtensionVersion() {
if _, exists := latest[k]; !exists { if _, exists := latest[k]; !exists {
mctx.ModuleErrorf("Module %v finalized for extension %d but never during an API level; likely error", v.module, v.version) mctx.ModuleErrorf("Module %v finalized for extension %d but never during an API level; likely error", v.module, v.version)
} }
// The extension version is always at least as new as the last sdk int version (potentially identical)
latest[k] = v latest[k] = v
} }
} }
}
// Sort the keys in order to make build.ninja stable // Sort the keys in order to make build.ninja stable
for _, k := range android.SortedStringKeys(latest) { for _, k := range android.SortedStringKeys(latest) {

29
java/prebuilt_apis_test.go
View File

@@ -61,7 +61,7 @@ func TestPrebuiltApis_SystemModulesCreation(t *testing.T) {
} }
func TestPrebuiltApis_WithExtensions(t *testing.T) { func TestPrebuiltApis_WithExtensions(t *testing.T) {
runTestWithBaseExtensionLevel := func(v int) (foo_input string, bar_input string) { runTestWithBaseExtensionLevel := func(v int) (foo_input, bar_input, baz_input string) {
result := android.GroupFixturePreparers( result := android.GroupFixturePreparers(
prepareForJavaTest, prepareForJavaTest,
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
@@ -69,7 +69,7 @@ func TestPrebuiltApis_WithExtensions(t *testing.T) {
}), }),
FixtureWithPrebuiltApisAndExtensions(map[string][]string{ FixtureWithPrebuiltApisAndExtensions(map[string][]string{
"31": {"foo"}, "31": {"foo"},
"32": {"foo", "bar"}, "32": {"foo", "bar", "baz"},
"current": {"foo", "bar"}, "current": {"foo", "bar"},
}, map[string][]string{ }, map[string][]string{
"1": {"foo"}, "1": {"foo"},
@@ -78,15 +78,24 @@ func TestPrebuiltApis_WithExtensions(t *testing.T) {
).RunTest(t) ).RunTest(t)
foo_input = result.ModuleForTests("foo.api.public.latest", "").Rule("generator").Implicits[0].String() foo_input = result.ModuleForTests("foo.api.public.latest", "").Rule("generator").Implicits[0].String()
bar_input = result.ModuleForTests("bar.api.public.latest", "").Rule("generator").Implicits[0].String() bar_input = result.ModuleForTests("bar.api.public.latest", "").Rule("generator").Implicits[0].String()
baz_input = result.ModuleForTests("baz.api.public.latest", "").Rule("generator").Implicits[0].String()
return return
} }
// Here, the base extension level is 1, so extension level 2 is the latest // Extension 2 is the latest for both foo and bar, finalized after the base extension version.
foo_input, bar_input := runTestWithBaseExtensionLevel(1) foo_input, bar_input, baz_input := runTestWithBaseExtensionLevel(1)
android.AssertStringEquals(t, "Expected latest = extension level 2", "prebuilts/sdk/extensions/2/public/api/foo.txt", foo_input) android.AssertStringEquals(t, "Expected latest foo = extension level 2", "prebuilts/sdk/extensions/2/public/api/foo.txt", foo_input)
android.AssertStringEquals(t, "Expected latest = extension level 2", "prebuilts/sdk/extensions/2/public/api/bar.txt", bar_input) android.AssertStringEquals(t, "Expected latest bar = extension level 2", "prebuilts/sdk/extensions/2/public/api/bar.txt", bar_input)
android.AssertStringEquals(t, "Expected latest baz = api level 32", "prebuilts/sdk/32/public/api/baz.txt", baz_input)
// Here, the base extension level is 2, so 2 is not later than 32. // Extension 2 is the latest for both foo and bar, finalized together with 32
foo_input, bar_input = runTestWithBaseExtensionLevel(2) foo_input, bar_input, baz_input = runTestWithBaseExtensionLevel(2)
android.AssertStringEquals(t, "Expected latest = api level 32", "prebuilts/sdk/32/public/api/foo.txt", foo_input) android.AssertStringEquals(t, "Expected latest foo = extension level 2", "prebuilts/sdk/extensions/2/public/api/foo.txt", foo_input)
android.AssertStringEquals(t, "Expected latest = api level 32", "prebuilts/sdk/32/public/api/bar.txt", bar_input) android.AssertStringEquals(t, "Expected latest bar = extension level 2", "prebuilts/sdk/extensions/2/public/api/bar.txt", bar_input)
android.AssertStringEquals(t, "Expected latest baz = api level 32", "prebuilts/sdk/32/public/api/baz.txt", baz_input)
// Extension 3 is the current extension, but it has not yet been finalized.
foo_input, bar_input, baz_input = runTestWithBaseExtensionLevel(3)
android.AssertStringEquals(t, "Expected latest foo = extension level 2", "prebuilts/sdk/extensions/2/public/api/foo.txt", foo_input)
android.AssertStringEquals(t, "Expected latest bar = extension level 2", "prebuilts/sdk/extensions/2/public/api/bar.txt", bar_input)
android.AssertStringEquals(t, "Expected latest baz = api level 32", "prebuilts/sdk/32/public/api/baz.txt", baz_input)
} }