diff options
| author | 2020-07-28 00:36:11 +0000 | |
|---|---|---|
| committer | 2020-07-28 00:36:11 +0000 | |
| commit | 1b478e57a000b0a43baf36bf121bfbbe09228fee (patch) | |
| tree | 9637dcae54b13a67fa983788eeda51fb2c97b27d | |
| parent | 41b4d79dab95b97352dfbc894e65eec7832211ed (diff) | |
| parent | b0aa8515b9d4206d3038f8ea42304e0fd15fe3da (diff) | |
Merge "Deprecate VNDK-Lite"
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | android/variable.go | 2 | ||||
| -rw-r--r-- | cc/vndk.go | 4 |
3 files changed, 0 insertions, 10 deletions
diff --git a/android/config.go b/android/config.go index d680b652b..cafc71b75 100644 --- a/android/config.go +++ b/android/config.go @@ -1252,10 +1252,6 @@ func (c *config) MissingUsesLibraries() []string { 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) } diff --git a/android/variable.go b/android/variable.go index 2c8bd0720..582613815 100644 --- a/android/variable.go +++ b/android/variable.go @@ -308,8 +308,6 @@ type productVariables struct { 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"` diff --git a/cc/vndk.go b/cc/vndk.go index 4adf9d226..15843c6c6 100644 --- a/cc/vndk.go +++ b/cc/vndk.go @@ -559,10 +559,6 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex return } - if ctx.DeviceConfig().BoardVndkRuntimeDisable() { - return - } - var snapshotOutputs android.Paths /* |