Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0aa8515 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Deprecate VNDK-Lite 

Android S would not support upgrade from O-MR1 devices, so VNDK Lite
configuration is no more valid. This change removes all VNDK-lite
variables from soong.

Bug: 158719241
Test: m -j passed
Change-Id: I54093fd4ee37ceddfc33a0b216b7069372040a0c
Merged-In: I54093fd4ee37ceddfc33a0b216b7069372040a0c
parent f70ceecc

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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)

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -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"`

cc/vndk.go

+0 −4
Original line number Diff line number Diff line
@@ -559,10 +559,6 @@ func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContex 
		return

	}



	if ctx.DeviceConfig().BoardVndkRuntimeDisable() {

		return

	}



	var snapshotOutputs android.Paths



	/*