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

Move Ndk_abis from soong.config to soong.variables

Browse Source 
soong.config is not cleared between builds, which can cause
problems when switching between an ndk build and a platform build.

Bug: 118398924
Test: OUT_DIR=out_ndk DIST_DIR=dist build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: Ifc03a0c25f46625375cdda5723e4a09d7d8050d5
This commit is contained in:
Colin Cross
2018-10-24 16:10:32 -07:00
parent ddfcd42b25
commit 395f2cfa89
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/config.go
View File

@@ -41,7 +41,6 @@ const productVariablesFileName = "soong.variables"
// config file. These will be included in the config struct. // config file. These will be included in the config struct.
type FileConfigurableOptions struct { type FileConfigurableOptions struct {
Mega_device *bool `json:",omitempty"` Mega_device *bool `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"`
Host_bionic *bool `json:",omitempty"` Host_bionic *bool `json:",omitempty"`
} }
@@ -299,7 +298,7 @@ func NewConfig(srcDir, buildDir string) (Config, error) {
var archConfig []archConfig var archConfig []archConfig
if Bool(config.Mega_device) { if Bool(config.Mega_device) {
archConfig = getMegaDeviceConfig() archConfig = getMegaDeviceConfig()
} else if Bool(config.Ndk_abis) { } else if config.NdkAbis() {
archConfig = getNdkAbisConfig() archConfig = getNdkAbisConfig()
} }
@@ -862,6 +861,10 @@ func (c vendorConfig) IsSet(name string) bool {
return ok return ok
} }
func (c *config) NdkAbis() bool {
return Bool(c.productVariables.Ndk_abis)
}
func stringSlice(s *[]string) []string { func stringSlice(s *[]string) []string {
if s != nil { if s != nil {
return *s return *s

2
android/variable.go
View File

@@ -239,6 +239,8 @@ type productVariables struct {
BoardPlatPrivateSepolicyDirs []string `json:",omitempty"` BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"`
} }
func boolPtr(v bool) *bool { func boolPtr(v bool) *bool {

2
cc/ndk_headers.go
View File

@@ -134,7 +134,7 @@ func (m *headerModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// but keep them when doing regular platform build. // but keep them when doing regular platform build.
// Ndk_abis property is only set to true with build/soong/scripts/build-ndk-prebuilts.sh // Ndk_abis property is only set to true with build/soong/scripts/build-ndk-prebuilts.sh
// TODO: Revert this once MIPS is supported in NDK again. // TODO: Revert this once MIPS is supported in NDK again.
if Bool(ctx.AConfig().Ndk_abis) && strings.Contains(ctx.ModuleName(), "mips") { if ctx.Config().NdkAbis() && strings.Contains(ctx.ModuleName(), "mips") {
return return
} }

9
scripts/build-ndk-prebuilts.sh
View File

@@ -34,11 +34,6 @@ SOONG_OUT=${OUT_DIR}/soong
SOONG_NDK_OUT=${OUT_DIR}/soong/ndk SOONG_NDK_OUT=${OUT_DIR}/soong/ndk
rm -rf ${SOONG_OUT} rm -rf ${SOONG_OUT}
mkdir -p ${SOONG_OUT} mkdir -p ${SOONG_OUT}
cat > ${SOONG_OUT}/soong.config << EOF
{
"Ndk_abis": true
}
EOF
# We only really need to set some of these variables, but soong won't merge this # We only really need to set some of these variables, but soong won't merge this
# with the defaults, so we need to write out all the defaults with our values # with the defaults, so we need to write out all the defaults with our values
@@ -63,7 +58,9 @@ cat > ${SOONG_OUT}/soong.variables << EOF
], ],
"HostArch": "x86_64", "HostArch": "x86_64",
"Malloc_not_svelte": false, "Malloc_not_svelte": false,
"Safestack": false "Safestack": false,
"Ndk_abis": true
} }
EOF EOF
m --skip-make ${SOONG_OUT}/ndk.timestamp m --skip-make ${SOONG_OUT}/ndk.timestamp