diff options
| author | 2025-02-12 15:58:10 -0800 | |
|---|---|---|
| committer | 2025-02-12 15:58:10 -0800 | |
| commit | 47f3053165abd57f18ba51b762c8e17494a973b4 (patch) | |
| tree | d10fec0824dca2a764fe7da0d2557d917b06db7b /aconfig | |
| parent | c0229da0d9bad71db72d8b6224d7ef17296431fa (diff) | |
| parent | 7df723397b78b2e4b7024924d87d2d56ed02edd1 (diff) | |
Merge "Move dists to GenerateAndroidBuildActions" into main am: af8c7f85fc am: 7df723397b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3490886
Change-Id: If31711ee5cac4d60440954b6d8767f707375154e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'aconfig')
| -rw-r--r-- | aconfig/all_aconfig_declarations.go | 2 | ||||
| -rw-r--r-- | aconfig/build_flags/build_flags_singleton.go | 2 | ||||
| -rw-r--r-- | aconfig/exported_java_aconfig_library.go | 3 |
3 files changed, 0 insertions, 7 deletions
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go index b17820ea5..3d07e16dc 100644 --- a/aconfig/all_aconfig_declarations.go +++ b/aconfig/all_aconfig_declarations.go @@ -162,9 +162,7 @@ func (this *allAconfigDeclarationsSingleton) GenerateSingletonBuildActions(ctx a }) ctx.Phony("all_aconfig_declarations_textproto", this.releaseMap[rcName].intermediateTextProtoPath) } -} -func (this *allAconfigDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) { for _, rcName := range this.sortedConfigNames() { ctx.DistForGoal("droid", this.releaseMap[rcName].intermediateBinaryProtoPath) for _, goal := range []string{"docs", "droid", "sdk"} { diff --git a/aconfig/build_flags/build_flags_singleton.go b/aconfig/build_flags/build_flags_singleton.go index e76db49d5..e375d9c70 100644 --- a/aconfig/build_flags/build_flags_singleton.go +++ b/aconfig/build_flags/build_flags_singleton.go @@ -111,9 +111,7 @@ func (this *allBuildFlagDeclarationsSingleton) GenerateBuildActions(ctx android. this.configsBinaryProtoPath, this.configsTextProtoPath, ) -} -func (this *allBuildFlagDeclarationsSingleton) MakeVars(ctx android.MakeVarsContext) { ctx.DistForGoal("droid", this.flagsBinaryProtoPath) for _, goal := range []string{"docs", "droid", "sdk", "release_config_metadata"} { ctx.DistForGoalWithFilename(goal, this.flagsBinaryProtoPath, "build_flags/all_flags.pb") diff --git a/aconfig/exported_java_aconfig_library.go b/aconfig/exported_java_aconfig_library.go index dd068d10a..63d824a88 100644 --- a/aconfig/exported_java_aconfig_library.go +++ b/aconfig/exported_java_aconfig_library.go @@ -63,8 +63,5 @@ func (this *exportedJavaDeclarationsLibrarySingleton) GenerateBuildActions(ctx a }, }) ctx.Phony("exported_java_aconfig_library", this.intermediatePath) -} - -func (this *exportedJavaDeclarationsLibrarySingleton) MakeVars(ctx android.MakeVarsContext) { ctx.DistForGoalWithFilename("sdk", this.intermediatePath, "android-flags.jar") } |