summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-10-24 16:10:32 -0700
committer Colin Cross <ccross@android.com> 2018-10-24 23:20:10 +0000
commit395f2cfa8940fccd426d9bc830e4300e0076f407 (patch)
tree2bd32e8115a1e0fa65107aee514847b1dc905557 /android/variable.go
parentddfcd42b2527ec7e66dd310ee074d0343d8a06ee (diff)
Move Ndk_abis from soong.config to soong.variables
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
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/android/variable.go b/android/variable.go
index 476171bfb..2eb990083 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -239,6 +239,8 @@ type productVariables struct {
BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"`
+
+ Ndk_abis *bool `json:",omitempty"`
}
func boolPtr(v bool) *bool {