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

Commit a463f720 authored by Jooyung Han's avatar Jooyung Han
Browse files

delete redundant code 

no need to use separate test-only key for config.Once().

Test: m
Change-Id: I9e05d413504114df8f8ea8d9ef521db1d5da5d01
parent 61eb8aae

cc/vndk.go

+10 −17
Original line number Original line Diff line number Diff line
@@ -202,7 +202,6 @@ var ( 
	modulePathsKey                   = android.NewOnceKey("modulePaths")

	modulePathsKey                   = android.NewOnceKey("modulePaths")

	vndkSnapshotOutputsKey           = android.NewOnceKey("vndkSnapshotOutputs")

	vndkSnapshotOutputsKey           = android.NewOnceKey("vndkSnapshotOutputs")

	vndkMustUseVendorVariantListKey  = android.NewOnceKey("vndkMustUseVendorVariantListKey")

	vndkMustUseVendorVariantListKey  = android.NewOnceKey("vndkMustUseVendorVariantListKey")

	testVndkMustUseVendorVariantListKey = android.NewOnceKey("testVndkMustUseVendorVariantListKey")

	vndkLibrariesLock                sync.Mutex

	vndkLibrariesLock                sync.Mutex





	headerExts = []string{".h", ".hh", ".hpp", ".hxx", ".h++", ".inl", ".inc", ".ipp", ".h.generic"}

	headerExts = []string{".h", ".hh", ".hpp", ".hxx", ".h++", ".inl", ".inc", ".ipp", ".h.generic"}
@@ -252,12 +251,6 @@ func vndkSnapshotOutputs(config android.Config) *android.RuleBuilderInstalls { 




func vndkMustUseVendorVariantList(cfg android.Config) []string {

func vndkMustUseVendorVariantList(cfg android.Config) []string {

	return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} {

	return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} {

		override := cfg.Once(testVndkMustUseVendorVariantListKey, func() interface{} {

			return []string(nil)

		}).([]string)

		if override != nil {

			return override

		}

		return config.VndkMustUseVendorVariantList

		return config.VndkMustUseVendorVariantList

	}).([]string)

	}).([]string)

}

}
@@ -265,7 +258,7 @@ func vndkMustUseVendorVariantList(cfg android.Config) []string { 
// test may call this to override global configuration(config.VndkMustUseVendorVariantList)

// test may call this to override global configuration(config.VndkMustUseVendorVariantList)

// when it is called, it must be before the first call to vndkMustUseVendorVariantList()

// when it is called, it must be before the first call to vndkMustUseVendorVariantList()

func setVndkMustUseVendorVariantListForTest(config android.Config, mustUseVendorVariantList []string) {

func setVndkMustUseVendorVariantListForTest(config android.Config, mustUseVendorVariantList []string) {

	config.Once(testVndkMustUseVendorVariantListKey, func() interface{} {

	config.Once(vndkMustUseVendorVariantListKey, func() interface{} {

		return mustUseVendorVariantList

		return mustUseVendorVariantList

	})

	})

}

}