Revert "pass read new storage parameter to java codegen"
This reverts commit c98032785339de11e34ee3d4f94b3ec3ed70d324.
Reason for revert: Droidmonitor created revert due to b/356193768. Will be verifying through ABTD before submission.
Change-Id: Ifaaa33b07333683492bc54270b840df21bcd00ca
diff --git a/aconfig/codegen/init.go b/aconfig/codegen/init.go
index ed0b3ed..98d288f 100644
--- a/aconfig/codegen/init.go
+++ b/aconfig/codegen/init.go
@@ -32,7 +32,6 @@
` --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 @@
"$soong_zip",
},
Restat: true,
- }, "mode", "debug")
+ }, "mode")
// For cc_aconfig_library: Generate C++ library
cppRule = pctx.AndroidStaticRule("cc_aconfig_library",
diff --git a/aconfig/codegen/java_aconfig_library.go b/aconfig/codegen/java_aconfig_library.go
index ebca413..673ac2a 100644
--- a/aconfig/codegen/java_aconfig_library.go
+++ b/aconfig/codegen/java_aconfig_library.go
@@ -20,7 +20,6 @@
"github.com/google/blueprint"
"github.com/google/blueprint/proptools"
- "strconv"
)
type declarationsTagType struct {
@@ -72,7 +71,6 @@
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")
}
}
@@ -104,8 +102,7 @@
Output: srcJarPath,
Description: "aconfig.srcjar",
Args: map[string]string{
- "mode": mode,
- "debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
+ "mode": mode,
},
})