Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c561d6d1 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "pass read new storage parameter to java codegen"" into main am: 5c128346 

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



Change-Id: I80370e6a23874b25c0ba6aad1418d306d660b797
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59946005 5c128346

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",

aconfig/codegen/java_aconfig_library.go

+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()),

		},

	})

java/testing.go

+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",

	}