commit c2556685a6b5f59564c2fb4cce841f7b5fcff320
author Jeff DeCew <jeffdq@google.com> Wed Apr 24 19:54:55 2024 +0000
committer Jeff DeCew <jeffdq@google.com> Wed Apr 24 19:58:14 2024 +0000
tree d7a7c22807d3ee8a6482507a2384c6a82cf322b9
parent 489002ec4d7e0408ba886732f4e8faa1a63ec269

Support new generated CustomFeatureFlags

* Broaden jarjar Flags rules for NFC.  Note that this brings the NFC rules in line with other packages
* Opt classes named CustomFeatureFlags into Ravenwood

Flag: none
Bug: 336768870
Test: presubmit
Change-Id: Ib1e76ebd04915554f464ec9a3d101b07925e18be

nfc/jarjar-rules.txt

diff --git a/nfc/jarjar-rules.txt b/nfc/jarjar-rules.txt
index 4cd652d..6304c86 100644
--- a/nfc/jarjar-rules.txt
+++ b/nfc/jarjar-rules.txt
@@ -26,9 +26,8 @@
 rule android.os.PersistableBundleProto* com.android.nfc.x.@0
 
 # Used by framework-nfc for reading trunk stable flags
-rule android.nfc.FakeFeatureFlagsImpl* com.android.nfc.x.@0
-rule android.nfc.FeatureFlags* com.android.nfc.x.@0
-rule android.nfc.Flags* com.android.nfc.x.@0
+rule android.nfc.*Flags* com.android.nfc.x.@0
+rule android.nfc.Flags com.android.nfc.x.@0
 rule android.permission.flags.** com.android.nfc.x.@0
 
 # Used by framework-nfc for misc utilities