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

Merge "cc: add min_sdk_version prop" am: 1b7599d918

Browse Source 
Change-Id: I77665333fa5e77ac3614acb3f2d4b668f059475f
This commit is contained in:
Treehugger Robot
2020-04-22 01:03:54 +00:00
committed by Automerger Merge Worker
parent b9d442848e 1b7599d918
commit 9e6db091f5
2 changed files with 11 additions and 0 deletions
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. // two variants to be built, one for the platform and one for apps.
Sdk_version *string 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. // If true, always create an sdk variant and don't create a platform variant.
Sdk_variant_only *bool Sdk_variant_only *bool

8
sysprop/sysprop_library.go
View File

@@ -151,6 +151,12 @@ type syspropLibraryProperties struct {
// Whether public stub exists or not. // Whether public stub exists or not.
Public_stub *bool `blueprint:"mutated"` 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 ( var (
@@ -344,6 +350,7 @@ type ccLibraryProperties struct {
Vendor_available *bool Vendor_available *bool
Host_supported *bool Host_supported *bool
Apex_available []string Apex_available []string
Min_sdk_version *string
} }
type javaLibraryProperties struct { type javaLibraryProperties struct {
@@ -433,6 +440,7 @@ func syspropLibraryHook(ctx android.LoadHookContext, m *syspropLibrary) {
ccProps.Vendor_available = m.properties.Vendor_available ccProps.Vendor_available = m.properties.Vendor_available
ccProps.Host_supported = m.properties.Host_supported ccProps.Host_supported = m.properties.Host_supported
ccProps.Apex_available = m.ApexProperties.Apex_available ccProps.Apex_available = m.ApexProperties.Apex_available
ccProps.Min_sdk_version = m.properties.Cpp.Min_sdk_version
ctx.CreateModule(cc.LibraryFactory, &ccProps) ctx.CreateModule(cc.LibraryFactory, &ccProps)
scope := "internal" scope := "internal"