commit b4ca14acb346e32b6d0a5ec7e1150ab998b7f4d5
author Seigo Nonaka <nona@google.com> Sun Oct 01 00:05:49 2023 +0900
committer Seigo Nonaka <nona@google.com> Sun Oct 01 23:40:35 2023 +0000
tree 2ae8b8270302aa2a815f43e91383485456f38f88
parent 72536763a41a85fb7b2dd589397b823de92867d9

Simplify feature flags

Bug: N/A
Test: TreeHugger
Change-Id: I386efb692907835658a0772c25e91a6eb3b622da

libs/minikin/Android.bp

diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index 4bce209..5fb524a 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -94,7 +94,6 @@
             export_shared_lib_headers: [
                 "libicu",
             ],
-            cppflags: [ "-DUSE_FEATURE_FLAGS" ],
         },
         host: {
             shared_libs: [

libs/minikin/FeatureFlags.h

diff --git a/libs/minikin/FeatureFlags.h b/libs/minikin/FeatureFlags.h
index f5c1122..3aa2be6 100644
--- a/libs/minikin/FeatureFlags.h
+++ b/libs/minikin/FeatureFlags.h
@@ -17,26 +17,20 @@
 #ifndef MINIKIN_FEATURE_FLAGS_H
 #define MINIKIN_FEATURE_FLAGS_H
 
-#ifdef USE_FEATURE_FLAGS
+#ifdef __ANDROID__
 #include <com_android_text_flags.h>
-#endif  // USE_FEATURE_FLAGS
+#endif  // __ANDROID__
 
 namespace features {
 
-#ifdef USE_FEATURE_FLAGS
-
 inline bool phrase_strict_fallback() {
+#ifdef __ANDROID__
     return com_android_text_flags_phrase_strict_fallback();
-}
-
 #else
-
-inline bool phrase_strict_fallback() {
     return true;
+#endif  // __ANDROID__
 }
 
-#endif  // USE_FEATURE_FLAGS
-
 }  // namespace features
 
 #endif  // FEATURE_FLAGS