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 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c98032785339de11e34ee3d4f94b3ec3ed70d324) Merged-In: Id12816206a16b17c23e3a53832d268f1600107b3 Change-Id: I95ad9457e6d9c07a5a5b3074045a383f004113a9
This commit is contained in:
@@ -32,6 +32,7 @@ var (
|
|||||||
` --mode ${mode}` +
|
` --mode ${mode}` +
|
||||||
` --cache ${in}` +
|
` --cache ${in}` +
|
||||||
` --out ${out}.tmp` +
|
` --out ${out}.tmp` +
|
||||||
|
` --allow-instrumentation ${debug}` +
|
||||||
` && $soong_zip -write_if_changed -jar -o ${out} -C ${out}.tmp -D ${out}.tmp` +
|
` && $soong_zip -write_if_changed -jar -o ${out} -C ${out}.tmp -D ${out}.tmp` +
|
||||||
` && rm -rf ${out}.tmp`,
|
` && rm -rf ${out}.tmp`,
|
||||||
CommandDeps: []string{
|
CommandDeps: []string{
|
||||||
@@ -39,7 +40,7 @@ var (
|
|||||||
"$soong_zip",
|
"$soong_zip",
|
||||||
},
|
},
|
||||||
Restat: true,
|
Restat: true,
|
||||||
}, "mode")
|
}, "mode", "debug")
|
||||||
|
|
||||||
// For cc_aconfig_library: Generate C++ library
|
// For cc_aconfig_library: Generate C++ library
|
||||||
cppRule = pctx.AndroidStaticRule("cc_aconfig_library",
|
cppRule = pctx.AndroidStaticRule("cc_aconfig_library",
|
||||||
|
@@ -20,6 +20,7 @@ import (
|
|||||||
|
|
||||||
"github.com/google/blueprint"
|
"github.com/google/blueprint"
|
||||||
"github.com/google/blueprint/proptools"
|
"github.com/google/blueprint/proptools"
|
||||||
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
type declarationsTagType struct {
|
type declarationsTagType struct {
|
||||||
@@ -71,6 +72,7 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) DepsMutator(module *ja
|
|||||||
module.AddSharedLibrary("aconfig-annotations-lib")
|
module.AddSharedLibrary("aconfig-annotations-lib")
|
||||||
// TODO(b/303773055): Remove the annotation after access issue is resolved.
|
// TODO(b/303773055): Remove the annotation after access issue is resolved.
|
||||||
module.AddSharedLibrary("unsupportedappusage")
|
module.AddSharedLibrary("unsupportedappusage")
|
||||||
|
module.AddSharedLibrary("aconfig_storage_reader_java")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +104,8 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild
|
|||||||
Output: srcJarPath,
|
Output: srcJarPath,
|
||||||
Description: "aconfig.srcjar",
|
Description: "aconfig.srcjar",
|
||||||
Args: map[string]string{
|
Args: map[string]string{
|
||||||
"mode": mode,
|
"mode": mode,
|
||||||
|
"debug": strconv.FormatBool(ctx.Config().ReleaseReadFromNewStorage()),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@@ -424,7 +424,9 @@ func gatherRequiredDepsForTest() string {
|
|||||||
"kotlin-stdlib-jdk8",
|
"kotlin-stdlib-jdk8",
|
||||||
"kotlin-annotations",
|
"kotlin-annotations",
|
||||||
"stub-annotations",
|
"stub-annotations",
|
||||||
|
|
||||||
"aconfig-annotations-lib",
|
"aconfig-annotations-lib",
|
||||||
|
"aconfig_storage_reader_java",
|
||||||
"unsupportedappusage",
|
"unsupportedappusage",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user