From e11319d4661c0a9b461530d4c0d3ef1a87978571 Mon Sep 17 00:00:00 2001 From: Zhi Dou Date: Tue, 5 Mar 2024 22:21:03 +0000 Subject: [PATCH] enable exportable check If a library is built to mode exported, the flag declaration has to be set with exportable true. The reason for this requirement is only flags in the exportabel declarations will be repackaged. To prevent forgetting adding this attribute, this exportable attribute is required to be set for all exportable declarations. Test: m Bug: 310504781 Change-Id: I3ddafe0b212dabe86aa5000b1b76c7c412acc93c --- aconfig/codegen/java_aconfig_library.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/aconfig/codegen/java_aconfig_library.go b/aconfig/codegen/java_aconfig_library.go index 7d7296e6a..3d15ac9a9 100644 --- a/aconfig/codegen/java_aconfig_library.go +++ b/aconfig/codegen/java_aconfig_library.go @@ -92,12 +92,12 @@ func (callbacks *JavaAconfigDeclarationsLibraryCallbacks) GenerateSourceJarBuild if !isModeSupported(mode) { ctx.PropertyErrorf("mode", "%q is not a supported mode", mode) } - // TODO: uncomment this part after internal clean up - //if mode == "exported" && !declarations.Exportable { - // // if mode is exported, the corresponding aconfig_declaration must mark its - // // exportable property true - // ctx.PropertyErrorf("mode", "exported mode requires its aconfig_declaration has exportable prop true") - //} + + if mode == "exported" && !declarations.Exportable { + // if mode is exported, the corresponding aconfig_declaration must mark its + // exportable property true + ctx.PropertyErrorf("mode", "exported mode requires its aconfig_declaration has exportable prop true") + } ctx.Build(pctx, android.BuildParams{ Rule: javaRule,