diff options
| author | Jeff DeCew <jeffdq@google.com> | 2024-04-26 18:39:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 18:39:43 +0000 |
| commit | 0886f9289c431a3639ee7337f0d907cff47ae9ac (patch) | |
| tree | 49c7a98e308f13d83a0f91f5883983d3759f8108 | |
| parent | 3539fa7df64c255589d3d7ee6a064374bdb1b4a4 (diff) | |
| parent | c2556685a6b5f59564c2fb4cce841f7b5fcff320 (diff) | |
| download | base-0886f9289c431a3639ee7337f0d907cff47ae9ac.tar.gz | |
Merge "Support new generated CustomFeatureFlags" into main
| -rw-r--r-- | nfc/jarjar-rules.txt | 5 | ||||
| -rw-r--r-- | tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nfc/jarjar-rules.txt b/nfc/jarjar-rules.txt index 4cd652d6af7f..6304c86e8551 100644 --- a/nfc/jarjar-rules.txt +++ b/nfc/jarjar-rules.txt @@ -26,9 +26,8 @@ rule com.android.nfc.NfcDispatcherProto* com.android.nfc.x.@0 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 diff --git a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt index 8ca4732f57c4..a712ac00d3a4 100644 --- a/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt +++ b/tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/AndroidHeuristicsFilter.kt @@ -47,6 +47,8 @@ private fun ClassNodes.isAidlClass(className: String): Boolean { } /** + * Effectively apply @RavenwoodKeepWholeClass to all classes with these names + * * @return if a given class "seems like" an feature flags class. */ private fun ClassNodes.isFeatureFlagsClass(className: String): Boolean { @@ -55,5 +57,6 @@ private fun ClassNodes.isFeatureFlagsClass(className: String): Boolean { return className.endsWith("/Flags") || className.endsWith("/FeatureFlags") || className.endsWith("/FeatureFlagsImpl") + || className.endsWith("/CustomFeatureFlags") || className.endsWith("/FakeFeatureFlagsImpl"); } |