tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cc: add min_sdk_version prop"

Browse source
This commit is contained in:
Treehugger Robot 2020-04-22 00:48:34 +00:00 committed by Gerrit Code Review
commit 1b7599d918
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/cc.go
View file

@ -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

8
sysprop/sysprop_library.go
View file

@ -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"