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

Commit df1c59a6 authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Revert "pass read new storage parameter to java codegen" 

This reverts commit 9cf2e8e1.

Reason for revert:DroidMonitor - Potential culprit for http://b/369200837 - Verifying through ABTD before submission. 

Change-Id: I635ba732fba40b7c73b5c419ef204fb14e857cb2
parent 9cf2e8e1

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

	}