Merge "delete redundant code" (1f056cd6) · Commits · e / os / android_build_soong

cc/vndk.go

+10 −17

Original line number	Diff line number	Diff line
		@@ -202,7 +202,6 @@ var (
		modulePathsKey = android.NewOnceKey("modulePaths")
		vndkSnapshotOutputsKey = android.NewOnceKey("vndkSnapshotOutputs")
		vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey")
		testVndkMustUseVendorVariantListKey = android.NewOnceKey("testVndkMustUseVendorVariantListKey")
		vndkLibrariesLock sync.Mutex

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

		func vndkMustUseVendorVariantList(cfg android.Config) []string {
		return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} {
		override := cfg.Once(testVndkMustUseVendorVariantListKey, func() interface{} {
		return []string(nil)
		}).([]string)
		if override != nil {
		return override
		}
		return config.VndkMustUseVendorVariantList
		}).([]string)
		}
		@@ -275,7 +268,7 @@ func vndkMustUseVendorVariantList(cfg android.Config) []string {
		// test may call this to override global configuration(config.VndkMustUseVendorVariantList)
		// when it is called, it must be before the first call to vndkMustUseVendorVariantList()
		func setVndkMustUseVendorVariantListForTest(config android.Config, mustUseVendorVariantList []string) {
		config.Once(testVndkMustUseVendorVariantListKey, func() interface{} {
		config.Once(vndkMustUseVendorVariantListKey, func() interface{} {
		return mustUseVendorVariantList
		})
		}