summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-16 00:17:29 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-11-16 00:17:29 +0000
commit5e9d9ac6a2091bb1fa193760940231253220df43 (patch)
treec46c40ee1e8140c46f68320c8103ba364eae2bf6
parentb6f33be629725d5694bacb51884fd10e8ed0d56e (diff)
parent66c35a4ecdc12be8ba01319920236450a7f410eb (diff)
downloadminikin-5e9d9ac6a2091bb1fa193760940231253220df43.tar.gz
Snap for 11104212 from 66c35a4ecdc12be8ba01319920236450a7f410eb to 24Q1-release
Change-Id: I31ca38a0a5251cc8d8096bab6466ca8afc3615ee
-rw-r--r--libs/minikin/FeatureFlags.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/minikin/FeatureFlags.h b/libs/minikin/FeatureFlags.h
index 3c2e455..3218d2b 100644
--- a/libs/minikin/FeatureFlags.h
+++ b/libs/minikin/FeatureFlags.h
@@ -23,21 +23,21 @@
namespace features {
-inline bool phrase_strict_fallback() {
#ifdef __ANDROID__
- return com_android_text_flags_phrase_strict_fallback();
-#else
- return true;
-#endif // __ANDROID__
-}
+#define DEFINE_FEATURE_FLAG_ACCESSOROR(feature_name) \
+ inline bool feature_name() { \
+ static bool flag = com_android_text_flags_##feature_name(); \
+ return flag; \
+ }
+#else // __ANDROID__
+#define DEFINE_FEATURE_FLAG_ACCESSOROR(feature_name) \
+ inline bool feature_name() { \
+ return true; \
+ }
+#endif // __ANDROID__
-inline bool word_style_auto() {
-#ifdef __ANDROID__
- return com_android_text_flags_word_style_auto();
-#else
- return true;
-#endif // __ANDROID__
-}
+DEFINE_FEATURE_FLAG_ACCESSOROR(phrase_strict_fallback)
+DEFINE_FEATURE_FLAG_ACCESSOROR(word_style_auto)
} // namespace features