openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I612f736835ecd11d9317cc1dbf3f6508df0a7f46
This commit is contained in:
Treehugger Robot 2021-04-06 03:58:29 +00:00 committed by Automerger Merge Worker
parent b60432e4c8 8c56183fb7
commit b17e061ae9
15 changed files with 187 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
android/sdk_version.go
View File

@ -75,58 +75,15 @@ func (k SdkKind) String() string {
} }
} }
// SdkVersion represents a specific version number of an SDK spec of a particular kind
type SdkVersion int
const (
// special version number for a not-yet-frozen SDK
SdkVersionCurrent SdkVersion = SdkVersion(FutureApiLevelInt)
// special version number to be used for SDK specs where version number doesn't
// make sense, e.g. "none", "", etc.
SdkVersionNone SdkVersion = SdkVersion(0)
)
// IsCurrent checks if the SdkVersion refers to the not-yet-published version of an SdkKind
func (v SdkVersion) IsCurrent() bool {
return v == SdkVersionCurrent
}
// IsNumbered checks if the SdkVersion refers to the published (a.k.a numbered) version of an SdkKind
func (v SdkVersion) IsNumbered() bool {
return !v.IsCurrent() && v != SdkVersionNone
}
// String returns the string representation of this SdkVersion.
func (v SdkVersion) String() string {
if v.IsCurrent() {
return "current"
} else if v.IsNumbered() {
return strconv.Itoa(int(v))
}
return "(no version)"
}
func (v SdkVersion) ApiLevel(ctx EarlyModuleContext) ApiLevel {
return ApiLevelOrPanic(ctx, v.String())
}
// AsNumberString directly converts the numeric value of this sdk version as a string.
// When isNumbered() is true, this method is the same as String(). However, for SdkVersionCurrent
// and SdkVersionNone, this returns 10000 and 0 while String() returns "current" and "(no version"),
// respectively.
func (v SdkVersion) AsNumberString() string {
return strconv.Itoa(int(v))
}
// SdkSpec represents the kind and the version of an SDK for a module to build against // SdkSpec represents the kind and the version of an SDK for a module to build against
type SdkSpec struct { type SdkSpec struct {
Kind SdkKind Kind SdkKind
Version SdkVersion ApiLevel ApiLevel
Raw string Raw string
} }
func (s SdkSpec) String() string { func (s SdkSpec) String() string {
return fmt.Sprintf("%s_%s", s.Kind, s.Version) return fmt.Sprintf("%s_%s", s.Kind, s.ApiLevel)
} }
// Valid checks if this SdkSpec is well-formed. Note however that true doesn't mean that the // Valid checks if this SdkSpec is well-formed. Note however that true doesn't mean that the
@ -177,10 +134,10 @@ func (s SdkSpec) ForVendorPartition(ctx EarlyModuleContext) SdkSpec {
} }
if s.Kind == SdkPublic || s.Kind == SdkSystem { if s.Kind == SdkPublic || s.Kind == SdkSystem {
if s.Version.IsCurrent() { if s.ApiLevel.IsCurrent() {
if i, err := strconv.Atoi(currentSdkVersion); err == nil { if i, err := strconv.Atoi(currentSdkVersion); err == nil {
version := SdkVersion(i) apiLevel := uncheckedFinalApiLevel(i)
return SdkSpec{s.Kind, version, s.Raw} return SdkSpec{s.Kind, apiLevel, s.Raw}
} }
panic(fmt.Errorf("BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES must be either \"current\" or a number, but was %q", currentSdkVersion)) panic(fmt.Errorf("BOARD_CURRENT_API_LEVEL_FOR_VENDOR_MODULES must be either \"current\" or a number, but was %q", currentSdkVersion))
} }
@ -190,10 +147,10 @@ func (s SdkSpec) ForVendorPartition(ctx EarlyModuleContext) SdkSpec {
// UsePrebuilt determines whether prebuilt SDK should be used for this SdkSpec with the given context. // UsePrebuilt determines whether prebuilt SDK should be used for this SdkSpec with the given context.
func (s SdkSpec) UsePrebuilt(ctx EarlyModuleContext) bool { func (s SdkSpec) UsePrebuilt(ctx EarlyModuleContext) bool {
if s.Version.IsCurrent() { if s.ApiLevel.IsCurrent() {
// "current" can be built from source and be from prebuilt SDK // "current" can be built from source and be from prebuilt SDK
return ctx.Config().AlwaysUsePrebuiltSdks() return ctx.Config().AlwaysUsePrebuiltSdks()
} else if s.Version.IsNumbered() { } else if !s.ApiLevel.IsPreview() {
// validation check // validation check
if s.Kind != SdkPublic && s.Kind != SdkSystem && s.Kind != SdkTest && s.Kind != SdkModule { if s.Kind != SdkPublic && s.Kind != SdkSystem && s.Kind != SdkTest && s.Kind != SdkModule {
panic(fmt.Errorf("prebuilt SDK is not not available for SdkKind=%q", s.Kind)) panic(fmt.Errorf("prebuilt SDK is not not available for SdkKind=%q", s.Kind))
@ -206,50 +163,60 @@ func (s SdkSpec) UsePrebuilt(ctx EarlyModuleContext) bool {
return false return false
} }
// EffectiveVersion converts an SdkSpec into the concrete SdkVersion that the module // EffectiveVersion converts an SdkSpec into the concrete ApiLevel that the module should use. For
// should use. For modules targeting an unreleased SDK (meaning it does not yet have a number) // modules targeting an unreleased SDK (meaning it does not yet have a number) it returns
// it returns FutureApiLevel(10000). // FutureApiLevel(10000).
func (s SdkSpec) EffectiveVersion(ctx EarlyModuleContext) (SdkVersion, error) { func (s SdkSpec) EffectiveVersion(ctx EarlyModuleContext) (ApiLevel, error) {
if !s.Valid() { if !s.Valid() {
return s.Version, fmt.Errorf("invalid sdk version %q", s.Raw) return s.ApiLevel, fmt.Errorf("invalid sdk version %q", s.Raw)
} }
if ctx.DeviceSpecific() || ctx.SocSpecific() { if ctx.DeviceSpecific() || ctx.SocSpecific() {
s = s.ForVendorPartition(ctx) s = s.ForVendorPartition(ctx)
} }
if s.Version.IsNumbered() { if !s.ApiLevel.IsPreview() {
return s.Version, nil return s.ApiLevel, nil
} }
return SdkVersion(ctx.Config().DefaultAppTargetSdk(ctx).FinalOrFutureInt()), nil ret := ctx.Config().DefaultAppTargetSdk(ctx)
if ret.IsPreview() {
return FutureApiLevel, nil
}
return ret, nil
} }
// EffectiveVersionString converts an SdkSpec into the concrete version string that the module // EffectiveVersionString converts an SdkSpec into the concrete version string that the module
// should use. For modules targeting an unreleased SDK (meaning it does not yet have a number) // should use. For modules targeting an unreleased SDK (meaning it does not yet have a number)
// it returns the codename (P, Q, R, etc.) // it returns the codename (P, Q, R, etc.)
func (s SdkSpec) EffectiveVersionString(ctx EarlyModuleContext) (string, error) { func (s SdkSpec) EffectiveVersionString(ctx EarlyModuleContext) (string, error) {
ver, err := s.EffectiveVersion(ctx) if !s.Valid() {
if err == nil && int(ver) == ctx.Config().DefaultAppTargetSdk(ctx).FinalOrFutureInt() { return s.ApiLevel.String(), fmt.Errorf("invalid sdk version %q", s.Raw)
return ctx.Config().DefaultAppTargetSdk(ctx).String(), nil
} }
return ver.String(), err
if ctx.DeviceSpecific() || ctx.SocSpecific() {
s = s.ForVendorPartition(ctx)
}
if !s.ApiLevel.IsPreview() {
return s.ApiLevel.String(), nil
}
return ctx.Config().DefaultAppTargetSdk(ctx).String(), nil
} }
func SdkSpecFrom(str string) SdkSpec { func SdkSpecFrom(str string) SdkSpec {
switch str { switch str {
// special cases first // special cases first
case "": case "":
return SdkSpec{SdkPrivate, SdkVersionNone, str} return SdkSpec{SdkPrivate, NoneApiLevel, str}
case "none": case "none":
return SdkSpec{SdkNone, SdkVersionNone, str} return SdkSpec{SdkNone, NoneApiLevel, str}
case "core_platform": case "core_platform":
return SdkSpec{SdkCorePlatform, SdkVersionNone, str} return SdkSpec{SdkCorePlatform, NoneApiLevel, str}
default: default:
// the syntax is [kind_]version // the syntax is [kind_]version
sep := strings.LastIndex(str, "_") sep := strings.LastIndex(str, "_")
var kindString string var kindString string
if sep == 0 { if sep == 0 {
return SdkSpec{SdkInvalid, SdkVersionNone, str} return SdkSpec{SdkInvalid, NoneApiLevel, str}
} else if sep == -1 { } else if sep == -1 {
kindString = "" kindString = ""
} else { } else {
@ -272,19 +239,19 @@ func SdkSpecFrom(str string) SdkSpec {
case "system_server": case "system_server":
kind = SdkSystemServer kind = SdkSystemServer
default: default:
return SdkSpec{SdkInvalid, SdkVersionNone, str} return SdkSpec{SdkInvalid, NoneApiLevel, str}
} }
var version SdkVersion var apiLevel ApiLevel
if versionString == "current" { if versionString == "current" {
version = SdkVersionCurrent apiLevel = FutureApiLevel
} else if i, err := strconv.Atoi(versionString); err == nil { } else if i, err := strconv.Atoi(versionString); err == nil {
version = SdkVersion(i) apiLevel = uncheckedFinalApiLevel(i)
} else { } else {
return SdkSpec{SdkInvalid, SdkVersionNone, str} return SdkSpec{SdkInvalid, apiLevel, str}
} }
return SdkSpec{kind, version, str} return SdkSpec{kind, apiLevel, str}
} }
} }
@ -292,7 +259,7 @@ func (s SdkSpec) ValidateSystemSdk(ctx EarlyModuleContext) bool {
// Ensures that the specified system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor/product Java module) // Ensures that the specified system SDK version is one of BOARD_SYSTEMSDK_VERSIONS (for vendor/product Java module)
// Assuming that BOARD_SYSTEMSDK_VERSIONS := 28 29, // Assuming that BOARD_SYSTEMSDK_VERSIONS := 28 29,
// sdk_version of the modules in vendor/product that use system sdk must be either system_28, system_29 or system_current // sdk_version of the modules in vendor/product that use system sdk must be either system_28, system_29 or system_current
if s.Kind != SdkSystem || !s.Version.IsNumbered() { if s.Kind != SdkSystem || s.ApiLevel.IsPreview() {
return true return true
} }
allowedVersions := ctx.DeviceConfig().PlatformSystemSdkVersions() allowedVersions := ctx.DeviceConfig().PlatformSystemSdkVersions()
@ -302,7 +269,7 @@ func (s SdkSpec) ValidateSystemSdk(ctx EarlyModuleContext) bool {
allowedVersions = systemSdkVersions allowedVersions = systemSdkVersions
} }
} }
if len(allowedVersions) > 0 && !InList(s.Version.String(), allowedVersions) { if len(allowedVersions) > 0 && !InList(s.ApiLevel.String(), allowedVersions) {
ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q", ctx.PropertyErrorf("sdk_version", "incompatible sdk version %q. System SDK version should be one of %q",
s.Raw, allowedVersions) s.Raw, allowedVersions)
return false return false

30
apex/apex_test.go
View File

@ -216,7 +216,7 @@ var prepareForApexTest = android.GroupFixturePreparers(
variables.Platform_sdk_codename = proptools.StringPtr("Q") variables.Platform_sdk_codename = proptools.StringPtr("Q")
variables.Platform_sdk_final = proptools.BoolPtr(false) variables.Platform_sdk_final = proptools.BoolPtr(false)
variables.Platform_version_active_codenames = []string{"Q"} variables.Platform_version_active_codenames = []string{"Q"}
variables.Platform_vndk_version = proptools.StringPtr("VER") variables.Platform_vndk_version = proptools.StringPtr("29")
}), }),
) )
@ -1366,13 +1366,13 @@ func TestApexDependsOnLLNDKTransitively(t *testing.T) {
ensureListEmpty(t, names(apexManifestRule.Args["provideNativeLibs"])) ensureListEmpty(t, names(apexManifestRule.Args["provideNativeLibs"]))
ensureListContains(t, names(apexManifestRule.Args["requireNativeLibs"]), "libbar.so") ensureListContains(t, names(apexManifestRule.Args["requireNativeLibs"]), "libbar.so")
mylibLdFlags := ctx.ModuleForTests("mylib", "android_vendor.VER_arm64_armv8-a_shared_"+tc.apexVariant).Rule("ld").Args["libFlags"] mylibLdFlags := ctx.ModuleForTests("mylib", "android_vendor.29_arm64_armv8-a_shared_"+tc.apexVariant).Rule("ld").Args["libFlags"]
ensureContains(t, mylibLdFlags, "libbar/android_vendor.VER_arm64_armv8-a_shared_"+tc.shouldLink+"/libbar.so") ensureContains(t, mylibLdFlags, "libbar/android_vendor.29_arm64_armv8-a_shared_"+tc.shouldLink+"/libbar.so")
for _, ver := range tc.shouldNotLink { for _, ver := range tc.shouldNotLink {
ensureNotContains(t, mylibLdFlags, "libbar/android_vendor.VER_arm64_armv8-a_shared_"+ver+"/libbar.so") ensureNotContains(t, mylibLdFlags, "libbar/android_vendor.29_arm64_armv8-a_shared_"+ver+"/libbar.so")
} }
mylibCFlags := ctx.ModuleForTests("mylib", "android_vendor.VER_arm64_armv8-a_static_"+tc.apexVariant).Rule("cc").Args["cFlags"] mylibCFlags := ctx.ModuleForTests("mylib", "android_vendor.29_arm64_armv8-a_static_"+tc.apexVariant).Rule("cc").Args["cFlags"]
ver := tc.shouldLink ver := tc.shouldLink
if tc.shouldLink == "current" { if tc.shouldLink == "current" {
ver = strconv.Itoa(android.FutureApiLevelInt) ver = strconv.Itoa(android.FutureApiLevelInt)
@ -2411,8 +2411,8 @@ func TestUseVendor(t *testing.T) {
inputsString := strings.Join(inputsList, " ") inputsString := strings.Join(inputsList, " ")
// ensure that the apex includes vendor variants of the direct and indirect deps // ensure that the apex includes vendor variants of the direct and indirect deps
ensureContains(t, inputsString, "android_vendor.VER_arm64_armv8-a_shared_apex10000/mylib.so") ensureContains(t, inputsString, "android_vendor.29_arm64_armv8-a_shared_apex10000/mylib.so")
ensureContains(t, inputsString, "android_vendor.VER_arm64_armv8-a_shared_apex10000/mylib2.so") ensureContains(t, inputsString, "android_vendor.29_arm64_armv8-a_shared_apex10000/mylib2.so")
// ensure that the apex does not include core variants // ensure that the apex does not include core variants
ensureNotContains(t, inputsString, "android_arm64_armv8-a_shared_apex10000/mylib.so") ensureNotContains(t, inputsString, "android_arm64_armv8-a_shared_apex10000/mylib.so")
@ -2558,7 +2558,7 @@ func TestVendorApex_use_vndk_as_stable(t *testing.T) {
} }
`) `)
vendorVariant := "android_vendor.VER_arm64_armv8-a" vendorVariant := "android_vendor.29_arm64_armv8-a"
ldRule := ctx.ModuleForTests("mybin", vendorVariant+"_apex10000").Rule("ld") ldRule := ctx.ModuleForTests("mybin", vendorVariant+"_apex10000").Rule("ld")
libs := names(ldRule.Args["libFlags"]) libs := names(ldRule.Args["libFlags"])
@ -2607,7 +2607,7 @@ func TestProductVariant(t *testing.T) {
) )
cflags := strings.Fields( cflags := strings.Fields(
ctx.ModuleForTests("foo", "android_product.VER_arm64_armv8-a_apex10000").Rule("cc").Args["cFlags"]) ctx.ModuleForTests("foo", "android_product.29_arm64_armv8-a_apex10000").Rule("cc").Args["cFlags"])
ensureListContains(t, cflags, "-D__ANDROID_VNDK__") ensureListContains(t, cflags, "-D__ANDROID_VNDK__")
ensureListContains(t, cflags, "-D__ANDROID_APEX__") ensureListContains(t, cflags, "-D__ANDROID_APEX__")
ensureListContains(t, cflags, "-D__ANDROID_PRODUCT__") ensureListContains(t, cflags, "-D__ANDROID_PRODUCT__")
@ -3305,11 +3305,11 @@ func TestVndkApexCurrent(t *testing.T) {
"lib64/libvndk.so", "lib64/libvndk.so",
"lib64/libvndksp.so", "lib64/libvndksp.so",
"lib64/libc++.so", "lib64/libc++.so",
"etc/llndk.libraries.VER.txt", "etc/llndk.libraries.29.txt",
"etc/vndkcore.libraries.VER.txt", "etc/vndkcore.libraries.29.txt",
"etc/vndksp.libraries.VER.txt", "etc/vndksp.libraries.29.txt",
"etc/vndkprivate.libraries.VER.txt", "etc/vndkprivate.libraries.29.txt",
"etc/vndkproduct.libraries.VER.txt", "etc/vndkproduct.libraries.29.txt",
}) })
} }
@ -3495,7 +3495,7 @@ func TestVndkApexNameRule(t *testing.T) {
} }
} }
assertApexName("com.android.vndk.vVER", "com.android.vndk.current") assertApexName("com.android.vndk.v29", "com.android.vndk.current")
assertApexName("com.android.vndk.v28", "com.android.vndk.v28") assertApexName("com.android.vndk.v28", "com.android.vndk.v28")
} }

18
apex/vndk_test.go
View File

@ -59,11 +59,11 @@ func TestVndkApexForVndkLite(t *testing.T) {
"lib/libc++.so", "lib/libc++.so",
"lib64/libvndksp.so", "lib64/libvndksp.so",
"lib64/libc++.so", "lib64/libc++.so",
"etc/llndk.libraries.VER.txt", "etc/llndk.libraries.29.txt",
"etc/vndkcore.libraries.VER.txt", "etc/vndkcore.libraries.29.txt",
"etc/vndksp.libraries.VER.txt", "etc/vndksp.libraries.29.txt",
"etc/vndkprivate.libraries.VER.txt", "etc/vndkprivate.libraries.29.txt",
"etc/vndkproduct.libraries.VER.txt", "etc/vndkproduct.libraries.29.txt",
}) })
} }
@ -111,7 +111,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
// VNDK APEX doesn't create apex variant // VNDK APEX doesn't create apex variant
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image") files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so") ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
}) })
t.Run("VNDK APEX gathers only vendor variants even if product variants are available", func(t *testing.T) { t.Run("VNDK APEX gathers only vendor variants even if product variants are available", func(t *testing.T) {
@ -123,7 +123,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
) )
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image") files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so") ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
}) })
t.Run("VNDK APEX supports coverage variants", func(t *testing.T) { t.Run("VNDK APEX supports coverage variants", func(t *testing.T) {
@ -135,9 +135,9 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
) )
files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image") files := getFiles(t, ctx, "com.android.vndk.current", "android_common_image")
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared/libfoo.so") ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared/libfoo.so")
files = getFiles(t, ctx, "com.android.vndk.current", "android_common_cov_image") files = getFiles(t, ctx, "com.android.vndk.current", "android_common_cov_image")
ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.VER_arm_armv7-a-neon_shared_cov/libfoo.so") ensureFileSrc(t, files, "lib/libfoo.so", "libfoo/android_vendor.29_arm_armv7-a-neon_shared_cov/libfoo.so")
}) })
} }

78
cc/cc_test.go
View File

@ -35,7 +35,7 @@ var prepareForCcTest = android.GroupFixturePreparers(
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.DeviceVndkVersion = StringPtr("current") variables.DeviceVndkVersion = StringPtr("current")
variables.ProductVndkVersion = StringPtr("current") variables.ProductVndkVersion = StringPtr("current")
variables.Platform_vndk_version = StringPtr("VER") variables.Platform_vndk_version = StringPtr("29")
}), }),
) )
@ -75,7 +75,7 @@ func testCc(t *testing.T, bp string) *android.TestContext {
func testCcNoVndk(t *testing.T, bp string) *android.TestContext { func testCcNoVndk(t *testing.T, bp string) *android.TestContext {
t.Helper() t.Helper()
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
return testCcWithConfig(t, config) return testCcWithConfig(t, config)
} }
@ -89,7 +89,7 @@ func testCcNoProductVndk(t *testing.T, bp string) *android.TestContext {
t.Helper() t.Helper()
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
return testCcWithConfig(t, config) return testCcWithConfig(t, config)
} }
@ -116,7 +116,7 @@ func testCcError(t *testing.T, pattern string, bp string) {
t.Helper() t.Helper()
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
testCcErrorWithConfig(t, pattern, config) testCcErrorWithConfig(t, pattern, config)
return return
} }
@ -131,15 +131,15 @@ func testCcErrorProductVndk(t *testing.T, pattern string, bp string) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
testCcErrorWithConfig(t, pattern, config) testCcErrorWithConfig(t, pattern, config)
return return
} }
const ( const (
coreVariant = "android_arm64_armv8-a_shared" coreVariant = "android_arm64_armv8-a_shared"
vendorVariant = "android_vendor.VER_arm64_armv8-a_shared" vendorVariant = "android_vendor.29_arm64_armv8-a_shared"
productVariant = "android_product.VER_arm64_armv8-a_shared" productVariant = "android_product.29_arm64_armv8-a_shared"
recoveryVariant = "android_recovery_arm64_armv8-a_shared" recoveryVariant = "android_recovery_arm64_armv8-a_shared"
) )
@ -456,7 +456,7 @@ func TestVndk(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
@ -486,8 +486,8 @@ func TestVndk(t *testing.T) {
vndkCoreLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-core") vndkCoreLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-core")
vndkSpLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-sp") vndkSpLib2ndPath := filepath.Join(vndkLib2ndPath, "shared", "vndk-sp")
variant := "android_vendor.VER_arm64_armv8-a_shared" variant := "android_vendor.29_arm64_armv8-a_shared"
variant2nd := "android_vendor.VER_arm_armv7-a-neon_shared" variant2nd := "android_vendor.29_arm_armv7-a-neon_shared"
snapshotSingleton := ctx.SingletonForTests("vndk-snapshot") snapshotSingleton := ctx.SingletonForTests("vndk-snapshot")
@ -577,12 +577,12 @@ func TestVndkLibrariesTxtAndroidMk(t *testing.T) {
}` }`
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
module := ctx.ModuleForTests("llndk.libraries.txt", "") module := ctx.ModuleForTests("llndk.libraries.txt", "")
entries := android.AndroidMkEntriesForTest(t, ctx, module.Module())[0] entries := android.AndroidMkEntriesForTest(t, ctx, module.Module())[0]
assertArrayString(t, entries.EntryMap["LOCAL_MODULE_STEM"], []string{"llndk.libraries.VER.txt"}) assertArrayString(t, entries.EntryMap["LOCAL_MODULE_STEM"], []string{"llndk.libraries.29.txt"})
} }
func TestVndkUsingCoreVariant(t *testing.T) { func TestVndkUsingCoreVariant(t *testing.T) {
@ -627,7 +627,7 @@ func TestVndkUsingCoreVariant(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
setVndkMustUseVendorVariantListForTest(config, []string{"libvndk"}) setVndkMustUseVendorVariantListForTest(config, []string{"libvndk"})
@ -654,7 +654,7 @@ func TestDataLibs(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
@ -705,7 +705,7 @@ func TestDataLibsRelativeInstallPath(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
@ -1331,7 +1331,7 @@ func TestVndkExt(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
@ -1776,7 +1776,7 @@ func TestProductVndkExtDependency(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.ProductVndkVersion = StringPtr("current") config.TestProductVariables.ProductVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
testCcWithConfig(t, config) testCcWithConfig(t, config)
} }
@ -2140,7 +2140,7 @@ func TestEnforceProductVndkVersion(t *testing.T) {
} }
func TestEnforceProductVndkVersionErrors(t *testing.T) { func TestEnforceProductVndkVersionErrors(t *testing.T) {
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", ` testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.29", `
cc_library { cc_library {
name: "libprod", name: "libprod",
product_specific: true, product_specific: true,
@ -2155,7 +2155,7 @@ func TestEnforceProductVndkVersionErrors(t *testing.T) {
nocrt: true, nocrt: true,
} }
`) `)
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", ` testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.29", `
cc_library { cc_library {
name: "libprod", name: "libprod",
product_specific: true, product_specific: true,
@ -2169,7 +2169,7 @@ func TestEnforceProductVndkVersionErrors(t *testing.T) {
nocrt: true, nocrt: true,
} }
`) `)
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", ` testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.29", `
cc_library { cc_library {
name: "libprod", name: "libprod",
product_specific: true, product_specific: true,
@ -2204,7 +2204,7 @@ func TestEnforceProductVndkVersionErrors(t *testing.T) {
nocrt: true, nocrt: true,
} }
`) `)
testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", ` testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.29", `
cc_library { cc_library {
name: "libprod", name: "libprod",
product_specific: true, product_specific: true,
@ -2330,7 +2330,7 @@ func TestMakeLinkType(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
// native:vndk // native:vndk
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
@ -2664,27 +2664,27 @@ func TestLlndkLibrary(t *testing.T) {
`) `)
actual := ctx.ModuleVariantsForTests("libllndk") actual := ctx.ModuleVariantsForTests("libllndk")
for i := 0; i < len(actual); i++ { for i := 0; i < len(actual); i++ {
if !strings.HasPrefix(actual[i], "android_vendor.VER_") { if !strings.HasPrefix(actual[i], "android_vendor.29_") {
actual = append(actual[:i], actual[i+1:]...) actual = append(actual[:i], actual[i+1:]...)
i-- i--
} }
} }
expected := []string{ expected := []string{
"android_vendor.VER_arm64_armv8-a_shared_1", "android_vendor.29_arm64_armv8-a_shared_1",
"android_vendor.VER_arm64_armv8-a_shared_2", "android_vendor.29_arm64_armv8-a_shared_2",
"android_vendor.VER_arm64_armv8-a_shared_current", "android_vendor.29_arm64_armv8-a_shared_current",
"android_vendor.VER_arm64_armv8-a_shared", "android_vendor.29_arm64_armv8-a_shared",
"android_vendor.VER_arm_armv7-a-neon_shared_1", "android_vendor.29_arm_armv7-a-neon_shared_1",
"android_vendor.VER_arm_armv7-a-neon_shared_2", "android_vendor.29_arm_armv7-a-neon_shared_2",
"android_vendor.VER_arm_armv7-a-neon_shared_current", "android_vendor.29_arm_armv7-a-neon_shared_current",
"android_vendor.VER_arm_armv7-a-neon_shared", "android_vendor.29_arm_armv7-a-neon_shared",
} }
checkEquals(t, "variants for llndk stubs", expected, actual) checkEquals(t, "variants for llndk stubs", expected, actual)
params := ctx.ModuleForTests("libllndk", "android_vendor.VER_arm_armv7-a-neon_shared").Description("generate stub") params := ctx.ModuleForTests("libllndk", "android_vendor.29_arm_armv7-a-neon_shared").Description("generate stub")
checkEquals(t, "use VNDK version for default stubs", "current", params.Args["apiLevel"]) checkEquals(t, "use VNDK version for default stubs", "current", params.Args["apiLevel"])
params = ctx.ModuleForTests("libllndk", "android_vendor.VER_arm_armv7-a-neon_shared_1").Description("generate stub") params = ctx.ModuleForTests("libllndk", "android_vendor.29_arm_armv7-a-neon_shared_1").Description("generate stub")
checkEquals(t, "override apiLevel for versioned stubs", "1", params.Args["apiLevel"]) checkEquals(t, "override apiLevel for versioned stubs", "1", params.Args["apiLevel"])
} }
@ -2714,7 +2714,7 @@ func TestLlndkHeaders(t *testing.T) {
`) `)
// _static variant is used since _shared reuses *.o from the static variant // _static variant is used since _shared reuses *.o from the static variant
cc := ctx.ModuleForTests("libvendor", "android_vendor.VER_arm_armv7-a-neon_static").Rule("cc") cc := ctx.ModuleForTests("libvendor", "android_vendor.29_arm_armv7-a-neon_static").Rule("cc")
cflags := cc.Args["cFlags"] cflags := cc.Args["cFlags"]
if !strings.Contains(cflags, "-Imy_include") { if !strings.Contains(cflags, "-Imy_include") {
t.Errorf("cflags for libvendor must contain -Imy_include, but was %#v.", cflags) t.Errorf("cflags for libvendor must contain -Imy_include, but was %#v.", cflags)
@ -2835,7 +2835,7 @@ func TestRuntimeLibs(t *testing.T) {
// runtime_libs for vendor variants have '.vendor' suffixes if the modules have both core // runtime_libs for vendor variants have '.vendor' suffixes if the modules have both core
// and vendor variants. // and vendor variants.
variant = "android_vendor.VER_arm64_armv8-a_shared" variant = "android_vendor.29_arm64_armv8-a_shared"
module = ctx.ModuleForTests("libvendor_available1", variant).Module().(*Module) module = ctx.ModuleForTests("libvendor_available1", variant).Module().(*Module)
checkRuntimeLibs(t, []string{"liball_available.vendor"}, module) checkRuntimeLibs(t, []string{"liball_available.vendor"}, module)
@ -2845,7 +2845,7 @@ func TestRuntimeLibs(t *testing.T) {
// runtime_libs for product variants have '.product' suffixes if the modules have both core // runtime_libs for product variants have '.product' suffixes if the modules have both core
// and product variants. // and product variants.
variant = "android_product.VER_arm64_armv8-a_shared" variant = "android_product.29_arm64_armv8-a_shared"
module = ctx.ModuleForTests("libproduct_available1", variant).Module().(*Module) module = ctx.ModuleForTests("libproduct_available1", variant).Module().(*Module)
checkRuntimeLibs(t, []string{"liball_available.product"}, module) checkRuntimeLibs(t, []string{"liball_available.product"}, module)
@ -2861,7 +2861,7 @@ func TestExcludeRuntimeLibs(t *testing.T) {
module := ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module) module := ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module)
checkRuntimeLibs(t, []string{"liball_available"}, module) checkRuntimeLibs(t, []string{"liball_available"}, module)
variant = "android_vendor.VER_arm64_armv8-a_shared" variant = "android_vendor.29_arm64_armv8-a_shared"
module = ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module) module = ctx.ModuleForTests("libvendor_available2", variant).Module().(*Module)
checkRuntimeLibs(t, nil, module) checkRuntimeLibs(t, nil, module)
} }
@ -3044,7 +3044,7 @@ func TestVendorPublicLibraries(t *testing.T) {
`) `)
coreVariant := "android_arm64_armv8-a_shared" coreVariant := "android_arm64_armv8-a_shared"
vendorVariant := "android_vendor.VER_arm64_armv8-a_shared" vendorVariant := "android_vendor.29_arm64_armv8-a_shared"
// test if header search paths are correctly added // test if header search paths are correctly added
// _static variant is used since _shared reuses *.o from the static variant // _static variant is used since _shared reuses *.o from the static variant
@ -3124,7 +3124,7 @@ func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true) config.TestProductVariables.VndkUseCoreVariant = BoolPtr(true)
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)

96
cc/vendor_snapshot_test.go
View File

@ -88,7 +88,7 @@ func TestVendorSnapshotCapture(t *testing.T) {
` `
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
// Check Vendor snapshot output. // Check Vendor snapshot output.
@ -108,7 +108,7 @@ func TestVendorSnapshotCapture(t *testing.T) {
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant) archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
// For shared libraries, only non-VNDK vendor_available modules are captured // For shared libraries, only non-VNDK vendor_available modules are captured
sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant) sharedVariant := fmt.Sprintf("android_vendor.29_%s_%s_shared", archType, archVariant)
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared") sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant) checkSnapshot(t, ctx, snapshotSingleton, "libvendor", "libvendor.so", sharedDir, sharedVariant)
checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant) checkSnapshot(t, ctx, snapshotSingleton, "libvendor_available", "libvendor_available.so", sharedDir, sharedVariant)
@ -121,8 +121,8 @@ func TestVendorSnapshotCapture(t *testing.T) {
// For static libraries, all vendor:true and vendor_available modules (including VNDK) are captured. // For static libraries, all vendor:true and vendor_available modules (including VNDK) are captured.
// Also cfi variants are captured, except for prebuilts like toolchain_library // Also cfi variants are captured, except for prebuilts like toolchain_library
staticVariant := fmt.Sprintf("android_vendor.VER_%s_%s_static", archType, archVariant) staticVariant := fmt.Sprintf("android_vendor.29_%s_%s_static", archType, archVariant)
staticCfiVariant := fmt.Sprintf("android_vendor.VER_%s_%s_static_cfi", archType, archVariant) staticCfiVariant := fmt.Sprintf("android_vendor.29_%s_%s_static_cfi", archType, archVariant)
staticDir := filepath.Join(snapshotVariantPath, archDir, "static") staticDir := filepath.Join(snapshotVariantPath, archDir, "static")
checkSnapshot(t, ctx, snapshotSingleton, "libb", "libb.a", staticDir, staticVariant) checkSnapshot(t, ctx, snapshotSingleton, "libb", "libb.a", staticDir, staticVariant)
checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.a", staticDir, staticVariant) checkSnapshot(t, ctx, snapshotSingleton, "libvndk", "libvndk.a", staticDir, staticVariant)
@ -142,7 +142,7 @@ func TestVendorSnapshotCapture(t *testing.T) {
// For binary executables, all vendor:true and vendor_available modules are captured. // For binary executables, all vendor:true and vendor_available modules are captured.
if archType == "arm64" { if archType == "arm64" {
binaryVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant) binaryVariant := fmt.Sprintf("android_vendor.29_%s_%s", archType, archVariant)
binaryDir := filepath.Join(snapshotVariantPath, archDir, "binary") binaryDir := filepath.Join(snapshotVariantPath, archDir, "binary")
checkSnapshot(t, ctx, snapshotSingleton, "vendor_bin", "vendor_bin", binaryDir, binaryVariant) checkSnapshot(t, ctx, snapshotSingleton, "vendor_bin", "vendor_bin", binaryDir, binaryVariant)
checkSnapshot(t, ctx, snapshotSingleton, "vendor_available_bin", "vendor_available_bin", binaryDir, binaryVariant) checkSnapshot(t, ctx, snapshotSingleton, "vendor_available_bin", "vendor_available_bin", binaryDir, binaryVariant)
@ -156,7 +156,7 @@ func TestVendorSnapshotCapture(t *testing.T) {
jsonFiles = append(jsonFiles, filepath.Join(headerDir, "libvendor_headers.json")) jsonFiles = append(jsonFiles, filepath.Join(headerDir, "libvendor_headers.json"))
// For object modules, all vendor:true and vendor_available modules are captured. // For object modules, all vendor:true and vendor_available modules are captured.
objectVariant := fmt.Sprintf("android_vendor.VER_%s_%s", archType, archVariant) objectVariant := fmt.Sprintf("android_vendor.29_%s_%s", archType, archVariant)
objectDir := filepath.Join(snapshotVariantPath, archDir, "object") objectDir := filepath.Join(snapshotVariantPath, archDir, "object")
checkSnapshot(t, ctx, snapshotSingleton, "obj", "obj.o", objectDir, objectVariant) checkSnapshot(t, ctx, snapshotSingleton, "obj", "obj.o", objectDir, objectVariant)
jsonFiles = append(jsonFiles, filepath.Join(objectDir, "obj.o.json")) jsonFiles = append(jsonFiles, filepath.Join(objectDir, "obj.o.json"))
@ -214,7 +214,7 @@ func TestVendorSnapshotDirected(t *testing.T) {
` `
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.DirectedVendorSnapshot = true config.TestProductVariables.DirectedVendorSnapshot = true
config.TestProductVariables.VendorSnapshotModules = make(map[string]bool) config.TestProductVariables.VendorSnapshotModules = make(map[string]bool)
config.TestProductVariables.VendorSnapshotModules["libvendor"] = true config.TestProductVariables.VendorSnapshotModules["libvendor"] = true
@ -237,7 +237,7 @@ func TestVendorSnapshotDirected(t *testing.T) {
archVariant := arch[1] archVariant := arch[1]
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant) archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant) sharedVariant := fmt.Sprintf("android_vendor.29_%s_%s_shared", archType, archVariant)
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared") sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
// Included modules // Included modules
@ -308,7 +308,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vndkBp := ` vndkBp := `
vndk_prebuilt_shared { vndk_prebuilt_shared {
name: "libvndk", name: "libvndk",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor_available: true, vendor_available: true,
product_available: true, product_available: true,
@ -326,7 +326,7 @@ func TestVendorSnapshotUse(t *testing.T) {
// old snapshot module which has to be ignored // old snapshot module which has to be ignored
vndk_prebuilt_shared { vndk_prebuilt_shared {
name: "libvndk", name: "libvndk",
version: "OLD", version: "26",
target_arch: "arm64", target_arch: "arm64",
vendor_available: true, vendor_available: true,
product_available: true, product_available: true,
@ -381,7 +381,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot { vendor_snapshot {
name: "vendor_snapshot", name: "vendor_snapshot",
compile_multilib: "first", compile_multilib: "first",
version: "BOARD", version: "28",
vndk_libs: [ vndk_libs: [
"libvndk", "libvndk",
], ],
@ -401,7 +401,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_static { vendor_snapshot_static {
name: "libvndk", name: "libvndk",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -414,7 +414,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_shared { vendor_snapshot_shared {
name: "libvendor", name: "libvendor",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
compile_multilib: "64", compile_multilib: "64",
vendor: true, vendor: true,
@ -433,7 +433,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_static { vendor_snapshot_static {
name: "libvendor", name: "libvendor",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -447,7 +447,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_shared { vendor_snapshot_shared {
name: "libvendor_available", name: "libvendor_available",
androidmk_suffix: ".vendor", androidmk_suffix: ".vendor",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -461,7 +461,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_static { vendor_snapshot_static {
name: "libvendor_available", name: "libvendor_available",
androidmk_suffix: ".vendor", androidmk_suffix: ".vendor",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -474,7 +474,7 @@ func TestVendorSnapshotUse(t *testing.T) {
vendor_snapshot_binary { vendor_snapshot_binary {
name: "bin", name: "bin",
version: "BOARD", version: "28",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -487,7 +487,7 @@ func TestVendorSnapshotUse(t *testing.T) {
// old snapshot module which has to be ignored // old snapshot module which has to be ignored
vendor_snapshot_binary { vendor_snapshot_binary {
name: "bin", name: "bin",
version: "OLD", version: "26",
target_arch: "arm64", target_arch: "arm64",
vendor: true, vendor: true,
arch: { arch: {
@ -517,8 +517,8 @@ func TestVendorSnapshotUse(t *testing.T) {
} }
config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS)
config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD") config.TestProductVariables.DeviceVndkVersion = StringPtr("28")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := CreateTestContext(config) ctx := CreateTestContext(config)
ctx.Register() ctx.Register()
@ -527,11 +527,11 @@ func TestVendorSnapshotUse(t *testing.T) {
_, errs = ctx.PrepareBuildActions(config) _, errs = ctx.PrepareBuildActions(config)
android.FailIfErrored(t, errs) android.FailIfErrored(t, errs)
sharedVariant := "android_vendor.BOARD_arm64_armv8-a_shared" sharedVariant := "android_vendor.28_arm64_armv8-a_shared"
staticVariant := "android_vendor.BOARD_arm64_armv8-a_static" staticVariant := "android_vendor.28_arm64_armv8-a_static"
binaryVariant := "android_vendor.BOARD_arm64_armv8-a" binaryVariant := "android_vendor.28_arm64_armv8-a"
// libclient uses libvndk.vndk.BOARD.arm64, libvendor.vendor_static.BOARD.arm64, libvendor_without_snapshot // libclient uses libvndk.vndk.28.arm64, libvendor.vendor_static.28.arm64, libvendor_without_snapshot
libclientCcFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("cc").Args["cFlags"] libclientCcFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("cc").Args["cFlags"]
for _, includeFlags := range []string{ for _, includeFlags := range []string{
"-Ivndk/include/libvndk", // libvndk "-Ivndk/include/libvndk", // libvndk
@ -545,8 +545,8 @@ func TestVendorSnapshotUse(t *testing.T) {
libclientLdFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("ld").Args["libFlags"] libclientLdFlags := ctx.ModuleForTests("libclient", sharedVariant).Rule("ld").Args["libFlags"]
for _, input := range [][]string{ for _, input := range [][]string{
[]string{sharedVariant, "libvndk.vndk.BOARD.arm64"}, []string{sharedVariant, "libvndk.vndk.28.arm64"},
[]string{staticVariant, "libvendor.vendor_static.BOARD.arm64"}, []string{staticVariant, "libvendor.vendor_static.28.arm64"},
[]string{staticVariant, "libvendor_without_snapshot"}, []string{staticVariant, "libvendor_without_snapshot"},
} { } {
outputPaths := getOutputPaths(ctx, input[0] /* variant */, []string{input[1]} /* module name */) outputPaths := getOutputPaths(ctx, input[0] /* variant */, []string{input[1]} /* module name */)
@ -565,7 +565,7 @@ func TestVendorSnapshotUse(t *testing.T) {
t.Errorf("wanted libclient AndroidMkStaticLibs %q, got %q", w, g) t.Errorf("wanted libclient AndroidMkStaticLibs %q, got %q", w, g)
} }
// bin_without_snapshot uses libvndk.vendor_static.BOARD.arm64 // bin_without_snapshot uses libvndk.vendor_static.28.arm64
binWithoutSnapshotCcFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("cc").Args["cFlags"] binWithoutSnapshotCcFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("cc").Args["cFlags"]
if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivendor/include/libvndk") { if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivendor/include/libvndk") {
t.Errorf("flags for bin_without_snapshot must contain %#v, but was %#v.", t.Errorf("flags for bin_without_snapshot must contain %#v, but was %#v.",
@ -573,28 +573,28 @@ func TestVendorSnapshotUse(t *testing.T) {
} }
binWithoutSnapshotLdFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("ld").Args["libFlags"] binWithoutSnapshotLdFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("ld").Args["libFlags"]
libVndkStaticOutputPaths := getOutputPaths(ctx, staticVariant, []string{"libvndk.vendor_static.BOARD.arm64"}) libVndkStaticOutputPaths := getOutputPaths(ctx, staticVariant, []string{"libvndk.vendor_static.28.arm64"})
if !strings.Contains(binWithoutSnapshotLdFlags, libVndkStaticOutputPaths[0].String()) { if !strings.Contains(binWithoutSnapshotLdFlags, libVndkStaticOutputPaths[0].String()) {
t.Errorf("libflags for bin_without_snapshot must contain %#v, but was %#v", t.Errorf("libflags for bin_without_snapshot must contain %#v, but was %#v",
libVndkStaticOutputPaths[0], binWithoutSnapshotLdFlags) libVndkStaticOutputPaths[0], binWithoutSnapshotLdFlags)
} }
// libvendor.so is installed by libvendor.vendor_shared.BOARD.arm64 // libvendor.so is installed by libvendor.vendor_shared.28.arm64
ctx.ModuleForTests("libvendor.vendor_shared.BOARD.arm64", sharedVariant).Output("libvendor.so") ctx.ModuleForTests("libvendor.vendor_shared.28.arm64", sharedVariant).Output("libvendor.so")
// libvendor_available.so is installed by libvendor_available.vendor_shared.BOARD.arm64 // libvendor_available.so is installed by libvendor_available.vendor_shared.28.arm64
ctx.ModuleForTests("libvendor_available.vendor_shared.BOARD.arm64", sharedVariant).Output("libvendor_available.so") ctx.ModuleForTests("libvendor_available.vendor_shared.28.arm64", sharedVariant).Output("libvendor_available.so")
// libvendor_without_snapshot.so is installed by libvendor_without_snapshot // libvendor_without_snapshot.so is installed by libvendor_without_snapshot
ctx.ModuleForTests("libvendor_without_snapshot", sharedVariant).Output("libvendor_without_snapshot.so") ctx.ModuleForTests("libvendor_without_snapshot", sharedVariant).Output("libvendor_without_snapshot.so")
// bin is installed by bin.vendor_binary.BOARD.arm64 // bin is installed by bin.vendor_binary.28.arm64
ctx.ModuleForTests("bin.vendor_binary.BOARD.arm64", binaryVariant).Output("bin") ctx.ModuleForTests("bin.vendor_binary.28.arm64", binaryVariant).Output("bin")
// bin_without_snapshot is installed by bin_without_snapshot // bin_without_snapshot is installed by bin_without_snapshot
ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Output("bin_without_snapshot") ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Output("bin_without_snapshot")
// libvendor, libvendor_available and bin don't have vendor.BOARD variant // libvendor, libvendor_available and bin don't have vendor.28 variant
libvendorVariants := ctx.ModuleVariantsForTests("libvendor") libvendorVariants := ctx.ModuleVariantsForTests("libvendor")
if inList(sharedVariant, libvendorVariants) { if inList(sharedVariant, libvendorVariants) {
t.Errorf("libvendor must not have variant %#v, but it does", sharedVariant) t.Errorf("libvendor must not have variant %#v, but it does", sharedVariant)
@ -617,7 +617,7 @@ func TestVendorSnapshotSanitizer(t *testing.T) {
name: "libsnapshot", name: "libsnapshot",
vendor: true, vendor: true,
target_arch: "arm64", target_arch: "arm64",
version: "BOARD", version: "28",
arch: { arch: {
arm64: { arm64: {
src: "libsnapshot.a", src: "libsnapshot.a",
@ -629,18 +629,18 @@ func TestVendorSnapshotSanitizer(t *testing.T) {
} }
` `
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("BOARD") config.TestProductVariables.DeviceVndkVersion = StringPtr("28")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
// Check non-cfi and cfi variant. // Check non-cfi and cfi variant.
staticVariant := "android_vendor.BOARD_arm64_armv8-a_static" staticVariant := "android_vendor.28_arm64_armv8-a_static"
staticCfiVariant := "android_vendor.BOARD_arm64_armv8-a_static_cfi" staticCfiVariant := "android_vendor.28_arm64_armv8-a_static_cfi"
staticModule := ctx.ModuleForTests("libsnapshot.vendor_static.BOARD.arm64", staticVariant).Module().(*Module) staticModule := ctx.ModuleForTests("libsnapshot.vendor_static.28.arm64", staticVariant).Module().(*Module)
assertString(t, staticModule.outputFile.Path().Base(), "libsnapshot.a") assertString(t, staticModule.outputFile.Path().Base(), "libsnapshot.a")
staticCfiModule := ctx.ModuleForTests("libsnapshot.vendor_static.BOARD.arm64", staticCfiVariant).Module().(*Module) staticCfiModule := ctx.ModuleForTests("libsnapshot.vendor_static.28.arm64", staticCfiVariant).Module().(*Module)
assertString(t, staticCfiModule.outputFile.Path().Base(), "libsnapshot.cfi.a") assertString(t, staticCfiModule.outputFile.Path().Base(), "libsnapshot.cfi.a")
} }
@ -709,7 +709,7 @@ func TestVendorSnapshotExclude(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := CreateTestContext(config) ctx := CreateTestContext(config)
ctx.Register() ctx.Register()
@ -744,7 +744,7 @@ func TestVendorSnapshotExclude(t *testing.T) {
archVariant := arch[1] archVariant := arch[1]
archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant) archDir := fmt.Sprintf("arch-%s-%s", archType, archVariant)
sharedVariant := fmt.Sprintf("android_vendor.VER_%s_%s_shared", archType, archVariant) sharedVariant := fmt.Sprintf("android_vendor.29_%s_%s_shared", archType, archVariant)
sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared") sharedDir := filepath.Join(snapshotVariantPath, archDir, "shared")
// Included modules // Included modules
@ -801,7 +801,7 @@ func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := CreateTestContext(config) ctx := CreateTestContext(config)
ctx.Register() ctx.Register()
@ -875,7 +875,7 @@ func TestRecoverySnapshotCapture(t *testing.T) {
` `
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := testCcWithConfig(t, config) ctx := testCcWithConfig(t, config)
// Check Recovery snapshot output. // Check Recovery snapshot output.
@ -993,7 +993,7 @@ func TestRecoverySnapshotExclude(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS) config := TestConfig(t.TempDir(), android.Android, nil, "", mockFS)
config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
ctx := CreateTestContext(config) ctx := CreateTestContext(config)
ctx.Register() ctx.Register()
@ -1094,7 +1094,7 @@ func TestRecoverySnapshotDirected(t *testing.T) {
config := TestConfig(t.TempDir(), android.Android, nil, bp, nil) config := TestConfig(t.TempDir(), android.Android, nil, bp, nil)
config.TestProductVariables.DeviceVndkVersion = StringPtr("current") config.TestProductVariables.DeviceVndkVersion = StringPtr("current")
config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current") config.TestProductVariables.RecoverySnapshotVersion = StringPtr("current")
config.TestProductVariables.Platform_vndk_version = StringPtr("VER") config.TestProductVariables.Platform_vndk_version = StringPtr("29")
config.TestProductVariables.DirectedRecoverySnapshot = true config.TestProductVariables.DirectedRecoverySnapshot = true
config.TestProductVariables.RecoverySnapshotModules = make(map[string]bool) config.TestProductVariables.RecoverySnapshotModules = make(map[string]bool)
config.TestProductVariables.RecoverySnapshotModules["librecovery"] = true config.TestProductVariables.RecoverySnapshotModules["librecovery"] = true

2
java/android_manifest.go
View File

@ -55,7 +55,7 @@ func manifestFixer(ctx android.ModuleContext, manifest android.Path, sdkContext
if err != nil { if err != nil {
ctx.ModuleErrorf("invalid minSdkVersion: %s", err) ctx.ModuleErrorf("invalid minSdkVersion: %s", err)
} }
if minSdkVersion >= 23 { if minSdkVersion.FinalOrFutureInt() >= 23 {
args = append(args, fmt.Sprintf("--extract-native-libs=%v", !useEmbeddedNativeLibs)) args = append(args, fmt.Sprintf("--extract-native-libs=%v", !useEmbeddedNativeLibs))
} else if useEmbeddedNativeLibs { } else if useEmbeddedNativeLibs {
ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it", ctx.ModuleErrorf("module attempted to store uncompressed native libraries, but minSdkVersion=%d doesn't support it",

8
java/app.go
View File

@ -288,7 +288,7 @@ func (a *AndroidApp) checkAppSdkVersions(ctx android.ModuleContext) {
if minSdkVersion, err := a.MinSdkVersion().EffectiveVersion(ctx); err == nil { if minSdkVersion, err := a.MinSdkVersion().EffectiveVersion(ctx); err == nil {
a.checkJniLibsSdkVersion(ctx, minSdkVersion) a.checkJniLibsSdkVersion(ctx, minSdkVersion)
android.CheckMinSdkVersion(a, ctx, minSdkVersion.ApiLevel(ctx)) android.CheckMinSdkVersion(a, ctx, minSdkVersion)
} else { } else {
ctx.PropertyErrorf("min_sdk_version", "%s", err.Error()) ctx.PropertyErrorf("min_sdk_version", "%s", err.Error())
} }
@ -304,7 +304,7 @@ func (a *AndroidApp) checkAppSdkVersions(ctx android.ModuleContext) {
// because, sdk_version is overridden by min_sdk_version (if set as smaller) // because, sdk_version is overridden by min_sdk_version (if set as smaller)
// and sdkLinkType is checked with dependencies so we can be sure that the whole dependency tree // and sdkLinkType is checked with dependencies so we can be sure that the whole dependency tree
// will meet the requirements. // will meet the requirements.
func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVersion android.SdkVersion) { func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVersion android.ApiLevel) {
// It's enough to check direct JNI deps' sdk_version because all transitive deps from JNI deps are checked in cc.checkLinkType() // It's enough to check direct JNI deps' sdk_version because all transitive deps from JNI deps are checked in cc.checkLinkType()
ctx.VisitDirectDeps(func(m android.Module) { ctx.VisitDirectDeps(func(m android.Module) {
if !IsJniDepTag(ctx.OtherModuleDependencyTag(m)) { if !IsJniDepTag(ctx.OtherModuleDependencyTag(m)) {
@ -315,7 +315,7 @@ func (a *AndroidApp) checkJniLibsSdkVersion(ctx android.ModuleContext, minSdkVer
// We can rely on android.SdkSpec to convert it to <number> so that "current" is // We can rely on android.SdkSpec to convert it to <number> so that "current" is
// handled properly regardless of sdk finalization. // handled properly regardless of sdk finalization.
jniSdkVersion, err := android.SdkSpecFrom(dep.SdkVersion()).EffectiveVersion(ctx) jniSdkVersion, err := android.SdkSpecFrom(dep.SdkVersion()).EffectiveVersion(ctx)
if err != nil || minSdkVersion < jniSdkVersion { if err != nil || minSdkVersion.LessThan(jniSdkVersion) {
ctx.OtherModuleErrorf(dep, "sdk_version(%v) is higher than min_sdk_version(%v) of the containing android_app(%v)", ctx.OtherModuleErrorf(dep, "sdk_version(%v) is higher than min_sdk_version(%v) of the containing android_app(%v)",
dep.SdkVersion(), minSdkVersion, ctx.ModuleName()) dep.SdkVersion(), minSdkVersion, ctx.ModuleName())
return return
@ -333,7 +333,7 @@ func (a *AndroidApp) useEmbeddedNativeLibs(ctx android.ModuleContext) bool {
} }
apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo) apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo)
return (minSdkVersion >= 23 && Bool(a.appProperties.Use_embedded_native_libs)) || return (minSdkVersion.FinalOrFutureInt() >= 23 && Bool(a.appProperties.Use_embedded_native_libs)) ||
!apexInfo.IsForPlatform() !apexInfo.IsForPlatform()
} }

6
java/base.go
View File

@ -535,7 +535,7 @@ func (j *Module) TargetSdkVersion() android.SdkSpec {
} }
func (j *Module) MinSdkVersionString() string { func (j *Module) MinSdkVersionString() string {
return j.MinSdkVersion().Version.String() return j.MinSdkVersion().ApiLevel.String()
} }
func (j *Module) AvailableFor(what string) bool { func (j *Module) AvailableFor(what string) bool {
@ -1255,7 +1255,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
if ctx.Device() { if ctx.Device() {
lintSDKVersionString := func(sdkSpec android.SdkSpec) string { lintSDKVersionString := func(sdkSpec android.SdkSpec) string {
if v := sdkSpec.Version; v.IsNumbered() { if v := sdkSpec.ApiLevel; !v.IsPreview() {
return v.String() return v.String()
} else { } else {
return ctx.Config().DefaultAppTargetSdk(ctx).String() return ctx.Config().DefaultAppTargetSdk(ctx).String()
@ -1482,7 +1482,7 @@ func (j *Module) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
if err != nil { if err != nil {
return err return err
} }
if ver.ApiLevel(ctx).GreaterThan(sdkVersion) { if ver.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", ver) return fmt.Errorf("newer SDK(%v)", ver)
} }
return nil return nil

3
java/dex.go
View File

@ -15,6 +15,7 @@
package java package java
import ( import (
"strconv"
"strings" "strings"
"github.com/google/blueprint" "github.com/google/blueprint"
@ -179,7 +180,7 @@ func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion android.
ctx.PropertyErrorf("min_sdk_version", "%s", err) ctx.PropertyErrorf("min_sdk_version", "%s", err)
} }
flags = append(flags, "--min-api "+effectiveVersion.AsNumberString()) flags = append(flags, "--min-api "+strconv.Itoa(effectiveVersion.FinalOrFutureInt()))
return flags return flags
} }

4
java/java.go
View File

@ -1156,7 +1156,7 @@ func (j *Import) TargetSdkVersion() android.SdkSpec {
} }
func (j *Import) MinSdkVersionString() string { func (j *Import) MinSdkVersionString() string {
return j.MinSdkVersion().Version.String() return j.MinSdkVersion().ApiLevel.String()
} }
func (j *Import) Prebuilt() *android.Prebuilt { func (j *Import) Prebuilt() *android.Prebuilt {
@ -1370,7 +1370,7 @@ func (j *Import) ShouldSupportSdkVersion(ctx android.BaseModuleContext,
if err != nil { if err != nil {
return err return err
} }
if ver.ApiLevel(ctx).GreaterThan(sdkVersion) { if ver.GreaterThan(sdkVersion) {
return fmt.Errorf("newer SDK(%v)", ver) return fmt.Errorf("newer SDK(%v)", ver)
} }
return nil return nil

12
java/sdk.go
View File

@ -51,9 +51,9 @@ func defaultJavaLanguageVersion(ctx android.EarlyModuleContext, s android.SdkSpe
if err != nil { if err != nil {
ctx.PropertyErrorf("sdk_version", "%s", err) ctx.PropertyErrorf("sdk_version", "%s", err)
} }
if sdk <= 23 { if sdk.FinalOrFutureInt() <= 23 {
return JAVA_VERSION_7 return JAVA_VERSION_7
} else if sdk <= 29 { } else if sdk.FinalOrFutureInt() <= 29 {
return JAVA_VERSION_8 return JAVA_VERSION_8
} else { } else {
return JAVA_VERSION_9 return JAVA_VERSION_9
@ -76,11 +76,11 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
} }
if sdkVersion.UsePrebuilt(ctx) { if sdkVersion.UsePrebuilt(ctx) {
dir := filepath.Join("prebuilts", "sdk", sdkVersion.Version.String(), sdkVersion.Kind.String()) dir := filepath.Join("prebuilts", "sdk", sdkVersion.ApiLevel.String(), sdkVersion.Kind.String())
jar := filepath.Join(dir, "android.jar") jar := filepath.Join(dir, "android.jar")
// There's no aidl for other SDKs yet. // There's no aidl for other SDKs yet.
// TODO(77525052): Add aidl files for other SDKs too. // TODO(77525052): Add aidl files for other SDKs too.
publicDir := filepath.Join("prebuilts", "sdk", sdkVersion.Version.String(), "public") publicDir := filepath.Join("prebuilts", "sdk", sdkVersion.ApiLevel.String(), "public")
aidl := filepath.Join(publicDir, "framework.aidl") aidl := filepath.Join(publicDir, "framework.aidl")
jarPath := android.ExistentPathForSource(ctx, jar) jarPath := android.ExistentPathForSource(ctx, jar)
aidlPath := android.ExistentPathForSource(ctx, aidl) aidlPath := android.ExistentPathForSource(ctx, aidl)
@ -89,7 +89,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() { if (!jarPath.Valid() || !aidlPath.Valid()) && ctx.Config().AllowMissingDependencies() {
return sdkDep{ return sdkDep{
invalidVersion: true, invalidVersion: true,
bootclasspath: []string{fmt.Sprintf("sdk_%s_%s_android", sdkVersion.Kind, sdkVersion.Version.String())}, bootclasspath: []string{fmt.Sprintf("sdk_%s_%s_android", sdkVersion.Kind, sdkVersion.ApiLevel.String())},
} }
} }
@ -105,7 +105,7 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext android.SdkContext)
var systemModules string var systemModules string
if defaultJavaLanguageVersion(ctx, sdkVersion).usesJavaModules() { if defaultJavaLanguageVersion(ctx, sdkVersion).usesJavaModules() {
systemModules = "sdk_public_" + sdkVersion.Version.String() + "_system_modules" systemModules = "sdk_public_" + sdkVersion.ApiLevel.String() + "_system_modules"
} }
return sdkDep{ return sdkDep{

8
java/sdk_library.go
View File

@ -817,7 +817,7 @@ func (c *commonToSdkLibraryAndImport) findClosestScopePath(scope *apiScope) *sco
func (c *commonToSdkLibraryAndImport) selectHeaderJarsForSdkVersion(ctx android.BaseModuleContext, sdkVersion android.SdkSpec) android.Paths { func (c *commonToSdkLibraryAndImport) selectHeaderJarsForSdkVersion(ctx android.BaseModuleContext, sdkVersion android.SdkSpec) android.Paths {
// If a specific numeric version has been requested then use prebuilt versions of the sdk. // If a specific numeric version has been requested then use prebuilt versions of the sdk.
if sdkVersion.Version.IsNumbered() { if !sdkVersion.ApiLevel.IsPreview() {
return PrebuiltJars(ctx, c.moduleBase.BaseModuleName(), sdkVersion) return PrebuiltJars(ctx, c.moduleBase.BaseModuleName(), sdkVersion)
} }
@ -1466,15 +1466,15 @@ func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) {
} }
func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s android.SdkSpec) android.Paths { func PrebuiltJars(ctx android.BaseModuleContext, baseName string, s android.SdkSpec) android.Paths {
var ver android.SdkVersion var ver android.ApiLevel
var kind android.SdkKind var kind android.SdkKind
if s.UsePrebuilt(ctx) { if s.UsePrebuilt(ctx) {
ver = s.Version ver = s.ApiLevel
kind = s.Kind kind = s.Kind
} else { } else {
// We don't have prebuilt SDK for the specific sdkVersion. // We don't have prebuilt SDK for the specific sdkVersion.
// Instead of breaking the build, fallback to use "system_current" // Instead of breaking the build, fallback to use "system_current"
ver = android.SdkVersionCurrent ver = android.FutureApiLevel
kind = android.SdkSystem kind = android.SdkSystem
} }

4
rust/image_test.go
View File

@ -38,7 +38,7 @@ func TestVendorLinkage(t *testing.T) {
} }
`) `)
vendorBinary := ctx.ModuleForTests("fizz_vendor", "android_vendor.VER_arm64_armv8-a").Module().(*cc.Module) vendorBinary := ctx.ModuleForTests("fizz_vendor", "android_vendor.29_arm64_armv8-a").Module().(*cc.Module)
if !android.InList("libfoo_vendor", vendorBinary.Properties.AndroidMkStaticLibs) { if !android.InList("libfoo_vendor", vendorBinary.Properties.AndroidMkStaticLibs) {
t.Errorf("vendorBinary should have a dependency on libfoo_vendor") t.Errorf("vendorBinary should have a dependency on libfoo_vendor")
@ -56,7 +56,7 @@ func TestImageVndkCfgFlag(t *testing.T) {
} }
`) `)
vendor := ctx.ModuleForTests("libfoo", "android_vendor.VER_arm64_armv8-a_static").Rule("rustc") vendor := ctx.ModuleForTests("libfoo", "android_vendor.29_arm64_armv8-a_static").Rule("rustc")
if !strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_vndk'") { if !strings.Contains(vendor.Args["rustcFlags"], "--cfg 'android_vndk'") {
t.Errorf("missing \"--cfg 'android_vndk'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"]) t.Errorf("missing \"--cfg 'android_vndk'\" for libfoo vendor variant, rustcFlags: %#v", vendor.Args["rustcFlags"])

2
rust/rust_test.go
View File

@ -75,7 +75,7 @@ func testRustVndk(t *testing.T, bp string) *android.TestContext {
func(variables android.FixtureProductVariables) { func(variables android.FixtureProductVariables) {
variables.DeviceVndkVersion = StringPtr("current") variables.DeviceVndkVersion = StringPtr("current")
variables.ProductVndkVersion = StringPtr("current") variables.ProductVndkVersion = StringPtr("current")
variables.Platform_vndk_version = StringPtr("VER") variables.Platform_vndk_version = StringPtr("29")
}, },
), ),
).RunTestWithBp(t, bp) ).RunTestWithBp(t, bp)

16
sysprop/sysprop_test.go
View File

@ -129,7 +129,7 @@ func test(t *testing.T, bp string) *android.TestResult {
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.DeviceSystemSdkVersions = []string{"28"} variables.DeviceSystemSdkVersions = []string{"28"}
variables.DeviceVndkVersion = proptools.StringPtr("current") variables.DeviceVndkVersion = proptools.StringPtr("current")
variables.Platform_vndk_version = proptools.StringPtr("VER") variables.Platform_vndk_version = proptools.StringPtr("29")
}), }),
mockFS.AddToFixture(), mockFS.AddToFixture(),
android.FixtureWithRootAndroidBp(bp), android.FixtureWithRootAndroidBp(bp),
@ -246,10 +246,10 @@ func TestSyspropLibrary(t *testing.T) {
// Check for generated cc_library // Check for generated cc_library
for _, variant := range []string{ for _, variant := range []string{
"android_vendor.VER_arm_armv7-a-neon_shared", "android_vendor.29_arm_armv7-a-neon_shared",
"android_vendor.VER_arm_armv7-a-neon_static", "android_vendor.29_arm_armv7-a-neon_static",
"android_vendor.VER_arm64_armv8-a_shared", "android_vendor.29_arm64_armv8-a_shared",
"android_vendor.VER_arm64_armv8-a_static", "android_vendor.29_arm64_armv8-a_static",
} { } {
result.ModuleForTests("libsysprop-platform", variant) result.ModuleForTests("libsysprop-platform", variant)
result.ModuleForTests("libsysprop-vendor", variant) result.ModuleForTests("libsysprop-vendor", variant)
@ -277,15 +277,15 @@ func TestSyspropLibrary(t *testing.T) {
// Check for exported includes // Check for exported includes
coreVariant := "android_arm64_armv8-a_static" coreVariant := "android_arm64_armv8-a_static"
vendorVariant := "android_vendor.VER_arm64_armv8-a_static" vendorVariant := "android_vendor.29_arm64_armv8-a_static"
platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/include" platformInternalPath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/include"
platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/public/include" platformPublicCorePath := "libsysprop-platform/android_arm64_armv8-a_static/gen/sysprop/public/include"
platformPublicVendorPath := "libsysprop-platform/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/public/include" platformPublicVendorPath := "libsysprop-platform/android_vendor.29_arm64_armv8-a_static/gen/sysprop/public/include"
platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include" platformOnProductPath := "libsysprop-platform-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include"
vendorInternalPath := "libsysprop-vendor/android_vendor.VER_arm64_armv8-a_static/gen/sysprop/include" vendorInternalPath := "libsysprop-vendor/android_vendor.29_arm64_armv8-a_static/gen/sysprop/include"
vendorPublicPath := "libsysprop-vendor-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include" vendorPublicPath := "libsysprop-vendor-on-product/android_arm64_armv8-a_static/gen/sysprop/public/include"
platformClient := result.ModuleForTests("cc-client-platform", coreVariant) platformClient := result.ModuleForTests("cc-client-platform", coreVariant)