diff --git a/cc/cc.go b/cc/cc.go index fdfc221ab..6e02b2497 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -213,6 +213,9 @@ type BaseProperties struct { // two variants to be built, one for the platform and one for apps. Sdk_version *string + // Minimum sdk version that the artifact should support when it runs as part of mainline modules(APEX). + Min_sdk_version *string + // If true, always create an sdk variant and don't create a platform variant. Sdk_variant_only *bool diff --git a/sysprop/sysprop_library.go b/sysprop/sysprop_library.go index a2e35d9b0..093287312 100644 --- a/sysprop/sysprop_library.go +++ b/sysprop/sysprop_library.go @@ -151,6 +151,12 @@ type syspropLibraryProperties struct { // Whether public stub exists or not. Public_stub *bool `blueprint:"mutated"` + + Cpp struct { + // Minimum sdk version that the artifact should support when it runs as part of mainline modules(APEX). + // Forwarded to cc_library.min_sdk_version + Min_sdk_version *string + } } var ( @@ -344,6 +350,7 @@ type ccLibraryProperties struct { Vendor_available *bool Host_supported *bool Apex_available []string + Min_sdk_version *string } type javaLibraryProperties struct { @@ -433,6 +440,7 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) { ccProps.Vendor_available = m.properties.Vendor_available ccProps.Host_supported = m.properties.Host_supported ccProps.Apex_available = m.ApexProperties.Apex_available + ccProps.Min_sdk_version = m.properties.Cpp.Min_sdk_version ctx.CreateModule(cc.LibraryFactory, &ccProps) scope := "internal"