commit 1b478e57a000b0a43baf36bf121bfbbe09228fee
author Kiyoung Kim <kiyoungkim@google.com> Tue Jul 28 00:36:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 28 00:36:11 2020 +0000
tree 9637dcae54b13a67fa983788eeda51fb2c97b27d
parent 41b4d79dab95b97352dfbc894e65eec7832211ed
parent b0aa8515b9d4206d3038f8ea42304e0fd15fe3da

Merge "Deprecate VNDK-Lite"

android/config.go

diff --git a/android/config.go b/android/config.go
index d680b65..cafc71b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1252,10 +1252,6 @@
 	return c.productVariables.MissingUsesLibraries
 }
 
-func (c *deviceConfig) BoardVndkRuntimeDisable() bool {
-	return Bool(c.config.productVariables.BoardVndkRuntimeDisable)
-}
-
 func (c *deviceConfig) DeviceArch() string {
 	return String(c.config.productVariables.DeviceArch)
 }

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 2c8bd07..5826138 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -308,8 +308,6 @@
 	BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
 	BoardSepolicyM4Defs          []string `json:",omitempty"`
 
-	BoardVndkRuntimeDisable *bool `json:",omitempty"`
-
 	VendorVars map[string]map[string]string `json:",omitempty"`
 
 	Ndk_abis               *bool `json:",omitempty"`

cc/vndk.go

diff --git a/cc/vndk.go b/cc/vndk.go
index 4adf9d2..15843c6 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -559,10 +559,6 @@
 		return
 	}
 
-	if ctx.DeviceConfig().BoardVndkRuntimeDisable() {
-		return
-	}
-
 	var snapshotOutputs android.Paths
 
 	/*