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

Commit 9612480e authored by Zhi Dou's avatar Zhi Dou
Browse files

Revert^2 "pass read new storage parameter to java codegen" 

This reverts commit 848c6c93.

Reason for revert: The real issue is fixed in another cl, not related to this one

Change-Id: Id12816206a16b17c23e3a53832d268f1600107b3
parent 848c6c93

aconfig/codegen/init.go

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 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{
@@ -39,7 +40,7 @@ var ( 
				"$soong_zip",

			},

			Restat: true,

		}, "mode")

		}, "mode", "debug")



	// For cc_aconfig_library: Generate C++ library

	cppRule = pctx.AndroidStaticRule("cc_aconfig_library",

aconfig/codegen/java_aconfig_library.go

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


	"github.com/google/blueprint"

	"github.com/google/blueprint/proptools"

	"strconv"

)



type declarationsTagType struct {
@@ -71,6 +72,7 @@ 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")

	}

}
@@ -103,6 +105,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild 
		Description: "aconfig.srcjar",

		Args: map[string]string{

			"mode":  mode,

			"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),

		},

	})

java/testing.go

+1 −0
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ func gatherRequiredDepsForTest() string { 
		"stub-annotations",



		"aconfig-annotations-lib",

		"aconfig_storage_reader_java",

		"unsupportedappusage",

	}