From df1c59a657e4c45f7452ab8b608aea155b8931aa Mon Sep 17 00:00:00 2001
From: Liana Kazanova <lkazanova@google.com>
Date: Mon, 23 Sep 2024 21:54:04 +0000
Subject: [PATCH] Revert "pass read new storage parameter to java codegen"

This reverts commit 9cf2e8e1403b5e057aca10870080adbe3e621f83.

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

Change-Id: I635ba732fba40b7c73b5c419ef204fb14e857cb2
---
 aconfig/codegen/init.go                 | 3 +--
 aconfig/codegen/java_aconfig_library.go | 5 +----
 java/testing.go                         | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/aconfig/codegen/init.go b/aconfig/codegen/init.go
index ed0b3ed7f..98d288f0a 100644
--- a/aconfig/codegen/init.go
+++ b/aconfig/codegen/init.go
@@ -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",
diff --git a/aconfig/codegen/java_aconfig_library.go b/aconfig/codegen/java_aconfig_library.go
index ebca4134c..673ac2afe 100644
--- a/aconfig/codegen/java_aconfig_library.go
+++ b/aconfig/codegen/java_aconfig_library.go
@@ -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")
 	}
 }
 
@@ -104,8 +102,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild
 		Output:      srcJarPath,
 		Description: "aconfig.srcjar",
 		Args: map[string]string{
-			"mode":  mode,
-			"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
+			"mode": mode,
 		},
 	})
 
diff --git a/java/testing.go b/java/testing.go
index 6cc9fd125..0c79e9f7e 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -424,9 +424,7 @@ func gatherRequiredDepsForTest() string {
 		"kotlin-stdlib-jdk8",
 		"kotlin-annotations",
 		"stub-annotations",
-
 		"aconfig-annotations-lib",
-		"aconfig_storage_reader_java",
 		"unsupportedappusage",
 	}