commit d0315c056bbe3c093ac1eef137d2107b543a2a0b
author Chih-hung Hsieh <chh@google.com> Thu Oct 11 21:05:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 11 21:05:55 2018 +0000
tree 021e3481ee17c24178e7dd9fb372286a3d334c18
parent c755e25f615fe550e61a12ab84b2c590dd2364b1
parent 65c3c8cdd2c753ebb71d63769d1120288c7577ff

Merge "Suppress implicit-fallthrough warnings."

libs/minikin/Android.bp

diff --git a/libs/minikin/Android.bp b/libs/minikin/Android.bp
index 4793850..708b360 100644
--- a/libs/minikin/Android.bp
+++ b/libs/minikin/Android.bp
@@ -85,7 +85,10 @@
         "liblog",
         "libicuuc",
     ],
-    header_libs: ["libminikin_headers"],
+    header_libs: [
+        "libbase_headers",
+        "libminikin_headers",
+    ],
     export_header_lib_headers: ["libminikin_headers"],
     export_shared_lib_headers: ["libicuuc"],
     whole_static_libs: ["libgtest_prod"],

libs/minikin/GraphemeBreak.cpp

diff --git a/libs/minikin/GraphemeBreak.cpp b/libs/minikin/GraphemeBreak.cpp
index 7d06d8f..52b99c0 100644
--- a/libs/minikin/GraphemeBreak.cpp
+++ b/libs/minikin/GraphemeBreak.cpp
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <cstdint>
 
+#include <android-base/macros.h>
 #include <unicode/uchar.h>
 #include <unicode/utf16.h>
 
@@ -211,7 +212,7 @@
             if (offset < start + count) {
                 offset++;
             }
-        // fall through
+            FALLTHROUGH_INTENDED;
         case AT_OR_AFTER:
             while (!isGraphemeBreak(advances, buf, start, count, offset)) {
                 offset++;
@@ -221,7 +222,7 @@
             if (offset > start) {
                 offset--;
             }
-        // fall through
+            FALLTHROUGH_INTENDED;
         case AT_OR_BEFORE:
             while (!isGraphemeBreak(advances, buf, start, count, offset)) {
                 offset--;