summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-03-06 01:48:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-06 01:48:48 +0000
commitc2599194eeb51a88e1147745ae16ebd3adfb1681 (patch)
tree19eef3940b5dff4d149af3abb8f779425aa7ecc3
parentb51fb7c159f3873dba83a242420a5e4895acb10b (diff)
parentd3a0ea94baf6d49aa1b71ecbb76b0429f033bd5d (diff)
Merge "enable exportable check" into main am: d3a0ea94ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2989053 Change-Id: Icf264db1cc4aec61b4a28bb35ca1a06d7a0f05d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--aconfig/codegen/java_aconfig_library.go12
1 files 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,