Remove VSDK related code from build
Remove leftover VSDK related code from build, as they are no longer in use. Bug: 332986564 Test: AOSP CF build succeeded Change-Id: I7dcec66ddf6ee9a563ac09a3fa8a282c9e00258a
This commit is contained in:
@@ -1356,10 +1356,6 @@ func (c *config) FrameworksBaseDirExists(ctx PathGlobContext) bool {
|
||||
return ExistentPathForSource(ctx, "frameworks", "base", "Android.bp").Valid()
|
||||
}
|
||||
|
||||
func (c *config) VndkSnapshotBuildArtifacts() bool {
|
||||
return Bool(c.productVariables.VndkSnapshotBuildArtifacts)
|
||||
}
|
||||
|
||||
func (c *config) HasMultilibConflict(arch ArchType) bool {
|
||||
return c.multilibConflicts[arch]
|
||||
}
|
||||
@@ -1423,10 +1419,6 @@ func (c *deviceConfig) VendorPath() string {
|
||||
return "vendor"
|
||||
}
|
||||
|
||||
func (c *deviceConfig) RecoverySnapshotVersion() string {
|
||||
return String(c.config.productVariables.RecoverySnapshotVersion)
|
||||
}
|
||||
|
||||
func (c *deviceConfig) CurrentApiLevelForVendorModules() string {
|
||||
return StringDefault(c.config.productVariables.DeviceCurrentApiLevelForVendorModules, "current")
|
||||
}
|
||||
@@ -1804,22 +1796,6 @@ func (c *deviceConfig) IsPartnerTrebleSepolicyTestEnabled() bool {
|
||||
return c.SystemExtSepolicyPrebuiltApiDir() != "" || c.ProductSepolicyPrebuiltApiDir() != ""
|
||||
}
|
||||
|
||||
func (c *deviceConfig) DirectedVendorSnapshot() bool {
|
||||
return c.config.productVariables.DirectedVendorSnapshot
|
||||
}
|
||||
|
||||
func (c *deviceConfig) VendorSnapshotModules() map[string]bool {
|
||||
return c.config.productVariables.VendorSnapshotModules
|
||||
}
|
||||
|
||||
func (c *deviceConfig) DirectedRecoverySnapshot() bool {
|
||||
return c.config.productVariables.DirectedRecoverySnapshot
|
||||
}
|
||||
|
||||
func (c *deviceConfig) RecoverySnapshotModules() map[string]bool {
|
||||
return c.config.productVariables.RecoverySnapshotModules
|
||||
}
|
||||
|
||||
func createDirsMap(previous map[string]bool, dirs []string) (map[string]bool, error) {
|
||||
var ret = make(map[string]bool)
|
||||
for _, dir := range dirs {
|
||||
@@ -1846,40 +1822,6 @@ func (c *deviceConfig) createDirsMapOnce(onceKey OnceKey, previous map[string]bo
|
||||
return dirMap.(map[string]bool)
|
||||
}
|
||||
|
||||
var vendorSnapshotDirsExcludedKey = NewOnceKey("VendorSnapshotDirsExcludedMap")
|
||||
|
||||
func (c *deviceConfig) VendorSnapshotDirsExcludedMap() map[string]bool {
|
||||
return c.createDirsMapOnce(vendorSnapshotDirsExcludedKey, nil,
|
||||
c.config.productVariables.VendorSnapshotDirsExcluded)
|
||||
}
|
||||
|
||||
var vendorSnapshotDirsIncludedKey = NewOnceKey("VendorSnapshotDirsIncludedMap")
|
||||
|
||||
func (c *deviceConfig) VendorSnapshotDirsIncludedMap() map[string]bool {
|
||||
excludedMap := c.VendorSnapshotDirsExcludedMap()
|
||||
return c.createDirsMapOnce(vendorSnapshotDirsIncludedKey, excludedMap,
|
||||
c.config.productVariables.VendorSnapshotDirsIncluded)
|
||||
}
|
||||
|
||||
var recoverySnapshotDirsExcludedKey = NewOnceKey("RecoverySnapshotDirsExcludedMap")
|
||||
|
||||
func (c *deviceConfig) RecoverySnapshotDirsExcludedMap() map[string]bool {
|
||||
return c.createDirsMapOnce(recoverySnapshotDirsExcludedKey, nil,
|
||||
c.config.productVariables.RecoverySnapshotDirsExcluded)
|
||||
}
|
||||
|
||||
var recoverySnapshotDirsIncludedKey = NewOnceKey("RecoverySnapshotDirsIncludedMap")
|
||||
|
||||
func (c *deviceConfig) RecoverySnapshotDirsIncludedMap() map[string]bool {
|
||||
excludedMap := c.RecoverySnapshotDirsExcludedMap()
|
||||
return c.createDirsMapOnce(recoverySnapshotDirsIncludedKey, excludedMap,
|
||||
c.config.productVariables.RecoverySnapshotDirsIncluded)
|
||||
}
|
||||
|
||||
func (c *deviceConfig) HostFakeSnapshotEnabled() bool {
|
||||
return c.config.productVariables.HostFakeSnapshotEnabled
|
||||
}
|
||||
|
||||
func (c *deviceConfig) ShippingApiLevel() ApiLevel {
|
||||
if c.config.productVariables.Shipping_api_level == nil {
|
||||
return NoneApiLevel
|
||||
|
Reference in New Issue
Block a user