StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused hiddenapi_flags module type" am: 99e4fc13bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674027

Change-Id: I1a8326c6b33ba2fe2b1bcde2de7a28249e5bbd63
This commit is contained in:
Paul Duffin
2021-04-13 12:02:35 +00:00
committed by Automerger Merge Worker
parent 64e6f0ff5d 99e4fc13bf
commit 93391542f9
1 changed files with 0 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
java/hiddenapi_singleton.go
View File

@@ -15,8 +15,6 @@
package java package java
import ( import (
"fmt"
"android/soong/android" "android/soong/android"
) )
@@ -27,7 +25,6 @@ func init() {
func RegisterHiddenApiSingletonComponents(ctx android.RegistrationContext) { func RegisterHiddenApiSingletonComponents(ctx android.RegistrationContext) {
ctx.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory) ctx.RegisterSingletonType("hiddenapi", hiddenAPISingletonFactory)
ctx.RegisterSingletonType("hiddenapi_index", hiddenAPIIndexSingletonFactory) ctx.RegisterSingletonType("hiddenapi_index", hiddenAPIIndexSingletonFactory)
ctx.RegisterModuleType("hiddenapi_flags", hiddenAPIFlagsFactory)
} }
var PrepareForTestWithHiddenApiBuildComponents = android.FixtureRegisterWithContext(RegisterHiddenApiSingletonComponents) var PrepareForTestWithHiddenApiBuildComponents = android.FixtureRegisterWithContext(RegisterHiddenApiSingletonComponents)
@@ -392,51 +389,6 @@ func commitChangeForRestat(rule *android.RuleBuilder, tempPath, outputPath andro
Text(")") 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 { func hiddenAPIIndexSingletonFactory() android.Singleton {
return &hiddenAPIIndexSingleton{} return &hiddenAPIIndexSingleton{}
} }