Snap for 11211173 from 392a56e26ba4ff3e771e33dae522d7d8f105b895 to 24Q1-release (68c0698a) · Commits · e / os / android_build_soong

aconfig/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ bootstrap_go_package {
		"aconfig_values.go",
		"aconfig_value_set.go",
		"all_aconfig_declarations.go",
		"exported_java_aconfig_library.go",
		"init.go",
		"testing.go",
		],

aconfig/aconfig_declarations.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -211,6 +211,7 @@ func CollectDependencyAconfigFiles(ctx android.ModuleContext, mergedAconfigFiles
		}

		func mergeAconfigFiles(ctx android.ModuleContext, inputs android.Paths) android.Paths {
		inputs = android.LastUniquePaths(inputs)
		if len(inputs) == 1 {
		return android.Paths{inputs[0]}
		}

aconfig/exported_java_aconfig_library.go

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		// Copyright 2023 Google Inc. All rights reserved.
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package aconfig

		import (
		"android/soong/android"
		)

		func ExportedJavaDeclarationsLibraryFactory() android.Singleton {
		return &exportedJavaDeclarationsLibrarySingleton{}
		}

		type exportedJavaDeclarationsLibrarySingleton struct {
		intermediatePath android.OutputPath
		}

		func (this *exportedJavaDeclarationsLibrarySingleton) GenerateBuildActions(ctx android.SingletonContext) {
		// Find all of the aconfig_declarations modules
		var cacheFiles android.Paths
		ctx.VisitAllModules(func(module android.Module) {
		if !ctx.ModuleHasProvider(module, DeclarationsProviderKey) {
		return
		}
		decl := ctx.ModuleProvider(module, DeclarationsProviderKey).(DeclarationsProviderData)
		cacheFiles = append(cacheFiles, decl.IntermediateCacheOutputPath)
		})

		// Generate build action for aconfig
		this.intermediatePath = android.PathForIntermediates(ctx, "exported_java_aconfig_library.jar")
		ctx.Build(pctx, android.BuildParams{
		Rule: exportedJavaRule,
		Inputs: cacheFiles,
		Output: this.intermediatePath,
		Description: "exported_java_aconfig_library",
		Args: map[string]string{
		"cache_files": android.JoinPathsWithPrefix(cacheFiles, " "),
		},
		})
		ctx.Phony("exported_java_aconfig_library", this.intermediatePath)
		}

		func (this *exportedJavaDeclarationsLibrarySingleton) MakeVars(ctx android.MakeVarsContext) {
		ctx.DistForGoalWithFilename("sdk", this.intermediatePath, "android-flags.jar")
		}

aconfig/init.go

+15 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,20 @@ var (
		Command: `${aconfig} dump --dedup --format protobuf --out $out $flags`,
		CommandDeps: []string{"${aconfig}"},
		}, "flags")
		// For exported_java_aconfig_library: Generate a JAR from all
		// java_aconfig_libraries to be consumed by apps built outside the
		// platform
		exportedJavaRule = pctx.AndroidStaticRule("exported_java_aconfig_library",
		blueprint.RuleParams{
		Command: `rm -rf ${out}.tmp` +
		`&& for cache in ${cache_files}; do ${aconfig} create-java-lib --cache $$cache --out ${out}.tmp; done` +
		`&& $soong_zip -write_if_changed -jar -o ${out} -C ${out}.tmp -D ${out}.tmp` +
		`&& rm -rf ${out}.tmp`,
		CommandDeps: []string{
		"$aconfig",
		"$soong_zip",
		},
		}, "cache_files")
		)

		func init() {
		@@ -80,4 +94,5 @@ func RegisterBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("aconfig_values", ValuesFactory)
		ctx.RegisterModuleType("aconfig_value_set", ValueSetFactory)
		ctx.RegisterParallelSingletonType("all_aconfig_declarations", AllAconfigDeclarationsFactory)
		ctx.RegisterParallelSingletonType("exported_java_aconfig_library", ExportedJavaDeclarationsLibraryFactory)
		}

android/Android.bp

+0 −9

Original line number	Diff line number	Diff line
		@@ -12,14 +12,11 @@ bootstrap_go_package {
		"sbox_proto",
		"soong",
		"soong-android-soongconfig",
		"soong-bazel",
		"soong-cquery",
		"soong-remoteexec",
		"soong-response",
		"soong-shared",
		"soong-starlark",
		"soong-starlark-format",
		"soong-ui-bp2build_metrics_proto",
		"soong-ui-metrics_proto",
		"soong-android-allowlists",

		@@ -38,9 +35,6 @@ bootstrap_go_package {
		"arch.go",
		"arch_list.go",
		"base_module_context.go",
		"bazel.go",
		"bazel_handler.go",
		"bazel_paths.go",
		"buildinfo_prop.go",
		"config.go",
		"test_config.go",
		@@ -106,9 +100,6 @@ bootstrap_go_package {
		"androidmk_test.go",
		"apex_test.go",
		"arch_test.go",
		"bazel_handler_test.go",
		"bazel_paths_test.go",
		"bazel_test.go",
		"config_test.go",
		"config_bp2build_test.go",
		"configured_jars_test.go",