Merge "Revert "pass read new storage parameter to java codegen"" into main (5c128346) · Commits · e / os / android_build_soong

aconfig/codegen/init.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ var (
		` --mode ${mode}` +
		` --cache ${in}` +
		` --out ${out}.tmp` +
		` --allow-instrumentation ${debug}` +
		` && $soong_zip -write_if_changed -jar -o ${out} -C ${out}.tmp -D ${out}.tmp` +
		` && rm -rf ${out}.tmp`,
		CommandDeps: []string{
		@@ -40,7 +39,7 @@ var (
		"$soong_zip",
		},
		Restat: true,
		}, "mode", "debug")
		}, "mode")

		// For cc_aconfig_library: Generate C++ library
		cppRule = pctx.AndroidStaticRule("cc_aconfig_library",

+1 −4

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import (

		"github.com/google/blueprint"
		"github.com/google/blueprint/proptools"
		"strconv"
		)

		type declarationsTagType struct {
		@@ -72,7 +71,6 @@ func (callbacks JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module ja
		module.AddSharedLibrary("aconfig-annotations-lib")
		// TODO(b/303773055): Remove the annotation after access issue is resolved.
		module.AddSharedLibrary("unsupportedappusage")
		module.AddSharedLibrary("aconfig_storage_reader_java")
		}
		}

		@@ -105,7 +103,6 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild
		Description: "aconfig.srcjar",
		Args: map[string]string{
		"mode": mode,
		"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
		},
		})

+0 −2

Original line number	Diff line number	Diff line
		@@ -424,9 +424,7 @@ func gatherRequiredDepsForTest() string {
		"kotlin-stdlib-jdk8",
		"kotlin-annotations",
		"stub-annotations",

		"aconfig-annotations-lib",
		"aconfig_storage_reader_java",
		"unsupportedappusage",
		}