Apex: support codenames for min_sdk_version
Apex can use codenames like "Q", "R" for its min_sdk_version property.
Also, cc_library can use codenames for its stubs.versions.
Bug: 152655956
Test: m
Merged-In: I077ad7b2ac5d90b4c8708921e43846206f05ba70
Change-Id: I077ad7b2ac5d90b4c8708921e43846206f05ba70
(cherry picked from commit 29e91d2121
)
This commit is contained in:
@@ -17,6 +17,8 @@ package cc
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
)
|
||||
|
||||
func TestLibraryReuse(t *testing.T) {
|
||||
@@ -186,3 +188,55 @@ func TestLibraryReuse(t *testing.T) {
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestStubsVersions(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "libfoo",
|
||||
srcs: ["foo.c"],
|
||||
stubs: {
|
||||
versions: ["29", "R", "10000"],
|
||||
},
|
||||
}
|
||||
`
|
||||
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
||||
config.TestProductVariables.Platform_version_active_codenames = []string{"R"}
|
||||
ctx := testCcWithConfig(t, config)
|
||||
|
||||
variants := ctx.ModuleVariantsForTests("libfoo")
|
||||
for _, expectedVer := range []string{"29", "9000", "10000"} {
|
||||
expectedVariant := "android_arm_armv7-a-neon_shared_" + expectedVer
|
||||
if !inList(expectedVariant, variants) {
|
||||
t.Errorf("missing expected variant: %q", expectedVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStubsVersions_NotSorted(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "libfoo",
|
||||
srcs: ["foo.c"],
|
||||
stubs: {
|
||||
versions: ["29", "10000", "R"],
|
||||
},
|
||||
}
|
||||
`
|
||||
config := TestConfig(buildDir, android.Android, nil, bp, nil)
|
||||
config.TestProductVariables.Platform_version_active_codenames = []string{"R"}
|
||||
testCcErrorWithConfig(t, `"libfoo" .*: versions: not sorted`, config)
|
||||
}
|
||||
|
||||
func TestStubsVersions_ParseError(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "libfoo",
|
||||
srcs: ["foo.c"],
|
||||
stubs: {
|
||||
versions: ["29", "10000", "X"],
|
||||
},
|
||||
}
|
||||
`
|
||||
|
||||
testCcError(t, `"libfoo" .*: versions: SDK version should be`, bp)
|
||||
}
|
||||
|
Reference in New Issue
Block a user