Merge "Deprecate VNDK-Lite"

This commit is contained in:
Kiyoung Kim
2020-07-28 00:36:11 +00:00
committed by Gerrit Code Review
3 changed files with 0 additions and 10 deletions

View File

@@ -1252,10 +1252,6 @@ func (c *config) MissingUsesLibraries() []string {
return c.productVariables.MissingUsesLibraries return c.productVariables.MissingUsesLibraries
} }
func (c *deviceConfig) BoardVndkRuntimeDisable() bool {
return Bool(c.config.productVariables.BoardVndkRuntimeDisable)
}
func (c *deviceConfig) DeviceArch() string { func (c *deviceConfig) DeviceArch() string {
return String(c.config.productVariables.DeviceArch) return String(c.config.productVariables.DeviceArch)
} }

View File

@@ -308,8 +308,6 @@ type productVariables struct {
BoardPlatPrivateSepolicyDirs []string `json:",omitempty"` BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
BoardSepolicyM4Defs []string `json:",omitempty"` BoardSepolicyM4Defs []string `json:",omitempty"`
BoardVndkRuntimeDisable *bool `json:",omitempty"`
VendorVars map[string]map[string]string `json:",omitempty"` VendorVars map[string]map[string]string `json:",omitempty"`
Ndk_abis *bool `json:",omitempty"` Ndk_abis *bool `json:",omitempty"`

View File

@@ -559,10 +559,6 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex
return return
} }
if ctx.DeviceConfig().BoardVndkRuntimeDisable() {
return
}
var snapshotOutputs android.Paths var snapshotOutputs android.Paths
/* /*