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 /*