diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-03 18:39:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-10-03 18:39:13 +0000 |
| commit | 86acf0d3f37a7e70556791d8cf65e089c62d0e2b (patch) | |
| tree | 55185261fc0c9e6e379b683ced5f5df0b5690c37 | |
| parent | 211125ea3a4691ba68026b744531d5fdcc8ff32d (diff) | |
| parent | b4ca14acb346e32b6d0a5ec7e1150ab998b7f4d5 (diff) | |
| download | minikin-86acf0d3f37a7e70556791d8cf65e089c62d0e2b.tar.gz | |
Merge "Simplify feature flags" into main
| -rw-r--r-- | libs/minikin/Android.bp | 1 | ||||
| -rw-r--r-- | libs/minikin/FeatureFlags.h | 14 |
2 files changed, 4 insertions, 11 deletions
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 @@ cc_library { export_shared_lib_headers: [ "libicu", ], - cppflags: [ "-DUSE_FEATURE_FLAGS" ], }, host: { shared_libs: [ 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 |