From 395f2cfa8940fccd426d9bc830e4300e0076f407 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 24 Oct 2018 16:10:32 -0700
Subject: 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
---
 android/variable.go | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'android/variable.go')

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 {
-- 
cgit v1.2.3-59-g8ed1b