commit | 349ae8dd6bb70a53e69548f61a967791e46a3f06 | [log] [tgz] |
---|---|---|
author | Joe Onorato <joeo@google.com> | Mon Feb 05 22:46:00 2024 +0000 |
committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Feb 05 22:46:00 2024 +0000 |
tree | 3dbc6b2d71676b742478e663321a6a1cf4daf4e2 | |
parent | bb0d5866c56a7d9393fd48f99ef2edf063f0c218 [diff] [blame] |
Automatically propagate jarjar rules for aconfig libraries Test: treehugger Bug: 310504781 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:97c03a6dc659102ff40793759fb3f0f18164a85b) Merged-In: I639d12ff33175b7bed7e7d0595a40dd9b0d99367 Change-Id: I639d12ff33175b7bed7e7d0595a40dd9b0d99367
diff --git a/aconfig/codegen/java_aconfig_library.go b/aconfig/codegen/java_aconfig_library.go index e6817e0..4b8d346 100644 --- a/aconfig/codegen/java_aconfig_library.go +++ b/aconfig/codegen/java_aconfig_library.go
@@ -102,6 +102,13 @@ }, }) + // Mark our generated code as possibly needing jarjar repackaging + // TODO: Maybe control this with a property? + module.AddJarJarRenameRule(declarations.Package+".Flags", "") + module.AddJarJarRenameRule(declarations.Package+".FeatureFlags", "") + module.AddJarJarRenameRule(declarations.Package+".FeatureFlagsImpl", "") + module.AddJarJarRenameRule(declarations.Package+".FakeFeatureFlagsImpl", "") + return srcJarPath }