diff options
| author | Derek Sollenberger <djsollen@google.com> | 2020-02-21 11:43:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-21 11:43:02 +0000 |
| commit | 76e7430baead21c67fd4c81a36774a6461d2fb99 (patch) | |
| tree | 239a62b59c57b4b95d8e82943bf9a48e84439819 /native/graphics/jni/imagedecoder.cpp | |
| parent | 1ab8e44c06ca05806a81c6737cb3f6e316d8d25a (diff) | |
| parent | 2173ea286afff6766043227de0bc2d82d9595f77 (diff) | |
Merge changes from topic "HWUI_JNI"
* changes:
Export symbols for the newly exposed APEX/internal headers
Remove dependence on libandroid_runtime from Bitmap.cpp
Update Region.cpp to use AParcel NDK APIs
Cleanup header and build targets for libhwui clients.
Remove dependencies on headers outside UI module
Cleanup LOG_TAG when bundled in HWUI
Move android.graphics JNI & APEX files into HWUI
Diffstat (limited to 'native/graphics/jni/imagedecoder.cpp')
| -rw-r--r-- | native/graphics/jni/imagedecoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/graphics/jni/imagedecoder.cpp b/native/graphics/jni/imagedecoder.cpp index d1946b085df4..56f390698eb2 100644 --- a/native/graphics/jni/imagedecoder.cpp +++ b/native/graphics/jni/imagedecoder.cpp @@ -20,7 +20,7 @@ #include <android/bitmap.h> #include <android/data_space.h> #include <android/imagedecoder.h> -#include <android/graphics/MimeType.h> +#include <MimeType.h> #include <android/rect.h> #include <hwui/ImageDecoder.h> #include <log/log.h> |