Merge "Remove unused hiddenapi_flags module type" (99e4fc13) · Commits · e / os / android_build_soong

java/hiddenapi_singleton.go

+0 −48

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		package java

		import (
		"fmt"

		"android/soong/android"
		)

		@@ -27,7 +25,6 @@ func init() {
		func RegisterHiddenApiSingletonComponents(ctx android.RegistrationContext) {
		ctx.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory)
		ctx.RegisterSingletonType("hiddenapi_index", hiddenAPIIndexSingletonFactory)
		ctx.RegisterModuleType("hiddenapi_flags", hiddenAPIFlagsFactory)
		}

		var PrepareForTestWithHiddenApiBuildComponents = android.FixtureRegisterWithContext(RegisterHiddenApiSingletonComponents)
		@@ -392,51 +389,6 @@ func commitChangeForRestat(rule *android.RuleBuilder, tempPath, outputPath andro
		Text(")")
		}

		type hiddenAPIFlagsProperties struct {
		// name of the file into which the flags will be copied.
		Filename *string
		}

		type hiddenAPIFlags struct {
		android.ModuleBase

		properties hiddenAPIFlagsProperties

		outputFilePath android.OutputPath
		}

		func (h *hiddenAPIFlags) GenerateAndroidBuildActions(ctx android.ModuleContext) {
		filename := String(h.properties.Filename)

		inputPath := hiddenAPISingletonPaths(ctx).flags
		h.outputFilePath = android.PathForModuleOut(ctx, filename).OutputPath

		// This ensures that outputFilePath has the correct name for others to
		// use, as the source file may have a different name.
		ctx.Build(pctx, android.BuildParams{
		Rule: android.Cp,
		Output: h.outputFilePath,
		Input: inputPath,
		})
		}

		func (h *hiddenAPIFlags) OutputFiles(tag string) (android.Paths, error) {
		switch tag {
		case "":
		return android.Paths{h.outputFilePath}, nil
		default:
		return nil, fmt.Errorf("unsupported module reference tag %q", tag)
		}
		}

		// hiddenapi-flags provides access to the hiddenapi-flags.csv file generated during the build.
		func hiddenAPIFlagsFactory() android.Module {
		module := &hiddenAPIFlags{}
		module.AddProperties(&module.properties)
		android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
		return module
		}

		func hiddenAPIIndexSingletonFactory() android.Singleton {
		return &hiddenAPIIndexSingleton{}
		}