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

Add sdk_version property

Browse Source 
Add sdk_version property that will be used later for NDK builds.
For now, use it to determine if libnativehelper/include/nativehelper
should be added to the global include dirs.

Change-Id: I4e0f9b3f27c380b1ac28f163b1d2b43a46d7191c
This commit is contained in:
Colin Cross
2015-03-18 17:17:35 -07:00
parent 5049f02e60
commit efd8e48c4d
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/cc.go
View File

@@ -209,6 +209,9 @@ type ccProperties struct {
Release struct { Release struct {
Cflags []string `android:"arch_variant"` Cflags []string `android:"arch_variant"`
} `android:"arch_variant"` } `android:"arch_variant"`
// Minimum sdk version supported when compiling against the ndk
Sdk_version string
} }
type unusedProperties struct { type unusedProperties struct {
@@ -438,6 +441,10 @@ func (c *ccBase) flags(ctx common.AndroidModuleContext, toolchain toolchain) ccF
common.ModuleGenDir(ctx), common.ModuleGenDir(ctx),
}...) }...)
if c.properties.Sdk_version == "" {
flags.includeDirs = append(flags.includeDirs, "${SrcDir}/libnativehelper/include/nativehelper")
}
if arch.HostOrDevice.Device() && !c.properties.Allow_undefined_symbols { if arch.HostOrDevice.Device() && !c.properties.Allow_undefined_symbols {
flags.ldFlags = append(flags.ldFlags, "-Wl,--no-undefined") flags.ldFlags = append(flags.ldFlags, "-Wl,--no-undefined")
} }