| commit | dccca44ffda4836b56a21da95a046c9708ffd49c | [log] [tgz] |
|---|---|---|
| author | sergeyv <sergeyv@google.com> | Mon Mar 21 15:38:21 2016 -0700 |
| committer | sergeyv <sergeyv@google.com> | Mon Mar 21 15:55:46 2016 -0700 |
| tree | e4c0bcfeb0f37f0fd6ed4a08d58e701494bc61a8 | |
| parent | c57fc4787f5aadb129686e904b86d343c8ae3541 [diff] [blame] |
Reland: Move text logic from jni to hwui level Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/ Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 83f76ea..fddcfa8 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp
@@ -32,10 +32,12 @@ #include "SkPaint.h" #include "SkTypeface.h" -#include "MinikinSkia.h" -#include "MinikinUtils.h" -#include "Paint.h" -#include "minikin/LineBreaker.h" +#include <hwui/MinikinSkia.h> +#include <hwui/MinikinUtils.h> +#include <hwui/Paint.h> +#include <minikin/FontCollection.h> +#include <minikin/LineBreaker.h> +#include <minikin/MinikinFont.h> namespace android {