Index: chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc |
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc |
index 5afa7be5810263d13d56105cf34520c308377d4a..9593f54a9df67995356f80d453c94f3c495953a7 100644 |
--- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc |
+++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc |
@@ -2,6 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+// Hack, otherwise Byte which is used in jni.h is overriden by a macro in |
+// zlib/mozzconf.h and we get compile errors. |
+// TODO(moshayedi): crbug.com/554199. |
+#if defined(ANDROID) |
+#include <jni.h> |
mfomitchev
2015/11/10 21:27:28
There were some suggestions in https://codereview.
Hadi
2015/11/12 16:33:36
Fixing this in https://codereview.chromium.org/143
|
+#endif |
+ |
#include "base/logging.h" |
#include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" |
#include "chrome/browser/extensions/api/image_writer_private/error_messages.h" |