openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add tempPathForRestat to improve consistency" am: f434cb5c1d 

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

Change-Id: I694cc0ae72c9679dcb3f7fa53f553dc9e6f7ca85
This commit is contained in:
Treehugger Robot 2021-04-22 02:48:06 +00:00 committed by Automerger Merge Worker
parent e8bfb5a3a0 f434cb5c1d
commit 6c1532d37e
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/hiddenapi_modular.go
View File

@ -206,7 +206,7 @@ var hiddenAPIFlagFileInfoProvider = blueprint.NewProvider(hiddenAPIFlagFileInfo{
// augmentationInfo is a struct containing paths to files that augment the information provided by // augmentationInfo is a struct containing paths to files that augment the information provided by
// the moduleSpecificFlagsPaths. // the moduleSpecificFlagsPaths.
func ruleToGenerateHiddenApiFlags(ctx android.BuilderContext, outputPath android.WritablePath, baseFlagsPath android.Path, moduleSpecificFlagsPaths android.Paths, augmentationInfo hiddenAPIFlagFileInfo) { func ruleToGenerateHiddenApiFlags(ctx android.BuilderContext, outputPath android.WritablePath, baseFlagsPath android.Path, moduleSpecificFlagsPaths android.Paths, augmentationInfo hiddenAPIFlagFileInfo) {
tempPath := android.PathForOutput(ctx, outputPath.Rel()+".tmp") tempPath := tempPathForRestat(ctx, outputPath)
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
command := rule.Command(). command := rule.Command().
BuiltTool("generate_hiddenapi_lists"). BuiltTool("generate_hiddenapi_lists").

14
java/hiddenapi_singleton.go
View File

@ -15,6 +15,8 @@
package java package java
import ( import (
"strings"
"android/soong/android" "android/soong/android"
) )
@ -242,7 +244,7 @@ func stubFlagsRule(ctx android.SingletonContext) {
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
outputPath := hiddenAPISingletonPaths(ctx).stubFlags outputPath := hiddenAPISingletonPaths(ctx).stubFlags
tempPath := android.PathForOutput(ctx, outputPath.Rel()+".tmp") tempPath := tempPathForRestat(ctx, outputPath)
rule.MissingDeps(missingDeps) rule.MissingDeps(missingDeps)
@ -348,6 +350,16 @@ func emptyFlagsRule(ctx android.SingletonContext) android.Path {
return outputPath return outputPath
} }
// tempPathForRestat creates a path of the same type as the supplied type but with a name of
// <path>.tmp.
//
// e.g. If path is an OutputPath for out/soong/hiddenapi/hiddenapi-flags.csv then this will return
// an OutputPath for out/soong/hiddenapi/hiddenapi-flags.csv.tmp
func tempPathForRestat(ctx android.PathContext, path android.WritablePath) android.WritablePath {
extWithoutLeadingDot := strings.TrimPrefix(path.Ext(), ".")
return path.ReplaceExtension(ctx, extWithoutLeadingDot+".tmp")
}
// commitChangeForRestat adds a command to a rule that updates outputPath from tempPath if they are different. It // commitChangeForRestat adds a command to a rule that updates outputPath from tempPath if they are different. It
// also marks the rule as restat and marks the tempPath as a temporary file that should not be considered an output of // also marks the rule as restat and marks the tempPath as a temporary file that should not be considered an output of
// the rule. // the rule.

6
java/sdk.go
View File

@ -247,7 +247,7 @@ func createSdkFrameworkAidl(ctx android.SingletonContext) {
} }
combinedAidl := sdkFrameworkAidlPath(ctx) combinedAidl := sdkFrameworkAidlPath(ctx)
tempPath := combinedAidl.ReplaceExtension(ctx, "aidl.tmp") tempPath := tempPathForRestat(ctx, combinedAidl)
rule := createFrameworkAidl(stubsModules, tempPath, ctx) rule := createFrameworkAidl(stubsModules, tempPath, ctx)
@ -261,7 +261,7 @@ func createNonUpdatableFrameworkAidl(ctx android.SingletonContext) {
stubsModules := []string{"android_module_lib_stubs_current"} stubsModules := []string{"android_module_lib_stubs_current"}
combinedAidl := nonUpdatableFrameworkAidlPath(ctx) combinedAidl := nonUpdatableFrameworkAidlPath(ctx)
tempPath := combinedAidl.ReplaceExtension(ctx, "aidl.tmp") tempPath := tempPathForRestat(ctx, combinedAidl)
rule := createFrameworkAidl(stubsModules, tempPath, ctx) rule := createFrameworkAidl(stubsModules, tempPath, ctx)
@ -270,7 +270,7 @@ func createNonUpdatableFrameworkAidl(ctx android.SingletonContext) {
rule.Build("framework_non_updatable_aidl", "generate framework_non_updatable.aidl") rule.Build("framework_non_updatable_aidl", "generate framework_non_updatable.aidl")
} }
func createFrameworkAidl(stubsModules []string, path android.OutputPath, ctx android.SingletonContext) *android.RuleBuilder { func createFrameworkAidl(stubsModules []string, path android.WritablePath, ctx android.SingletonContext) *android.RuleBuilder {
stubsJars := make([]android.Paths, len(stubsModules)) stubsJars := make([]android.Paths, len(stubsModules))
ctx.VisitAllModules(func(module android.Module) { ctx.VisitAllModules(func(module android.Module) {