pass read new storage parameter to java codegen

When RELEASE_READ_FROM_NEW_STORAGE is true, enable reading from new
storage. So that we can ensure nextfood is not impacted.

Test: m and check cf
Bug: 349874828
Ignore-AOSP-First: the previous change ag/26821089 submitted internally this one depends on that change. The added code will be removed after test mission
Change-Id: I95ad9457e6d9c07a5a5b3074045a383f004113a9
This commit is contained in:
Zhi Dou
2024-07-23 20:30:48 +00:00
parent 7f7f61fcaf
commit c980327853
3 changed files with 7 additions and 2 deletions

View File

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

View File

@@ -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()),
},
})

View File

@@ -424,6 +424,7 @@ func gatherRequiredDepsForTest() string {
"stub-annotations",
"aconfig-annotations-lib",
"aconfig_storage_reader_java",
"unsupportedappusage",
}