| commit | ecb885bbb9588476f9c9aa5c6c6cd1e88d706d18 | [log] [tgz] |
|---|---|---|
| author | Andrew Grieve <[email protected]> | Wed May 29 18:14:19 2024 |
| committer | Chromium LUCI CQ <[email protected]> | Wed May 29 18:14:19 2024 |
| tree | 54166d7820ba1ca8c59ee7df87c5bd4c303fdc7f | |
| parent | 3ab41ed82203107c7f96e6e5dcce9b7b86d36619 [diff] [blame] |
Reland "Android: Move #include of _jni.h headers to after other headers" This reverts commit 00b861abe677c1df2e83895e6ebac39cf5c96f7a. Reason for reland: Fixed bad file Original change's description: > Revert "Android: Move #include of _jni.h headers to after other headers" > > This reverts commit 6a66fe96d7b252a70a11a27fc9630730dab14be2. > > Reason for revert: Build failure: > https://ci.chromium.org/ui/p/chromium/builders/ci/Cast%20Android%20(dbg)/239379/overview > > Original change's description: > > Android: Move #include of _jni.h headers to after other headers > > > > Scripted change that ignores includes within #if blocks: > > https://gist.github.com/agrieve/9b4ad9ef78955032a6db453b4b15dac0 > > > > No-Try: true > > Bug: 334905258 > > Change-Id: I9c60f2d6e91d93d213fca5cceee52f6c0df55542 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5575995 > > Auto-Submit: Andrew Grieve <[email protected]> > > Reviewed-by: Mohamed Heikal <[email protected]> > > Commit-Queue: Andrew Grieve <[email protected]> > > Owners-Override: Andrew Grieve <[email protected]> > > Cr-Commit-Position: refs/heads/main@{#1307450} > > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: 334905258 > Change-Id: I37a20e8850fb9ffd5b7af28fd1f6717220437ba9 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5581850 > Owners-Override: Francois Pierre Doray <[email protected]> > Reviewed-by: Mohamed Heikal <[email protected]> > Commit-Queue: Rubber Stamper <[email protected]> > Auto-Submit: Francois Pierre Doray <[email protected]> > Bot-Commit: Rubber Stamper <[email protected]> > Cr-Commit-Position: refs/heads/main@{#1307464} Bug: 334905258 No-Try: true Change-Id: Ie2b5398328e1a4c5bf6899b4d0bf0bae478f72e0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5581989 Reviewed-by: Mohamed Heikal <[email protected]> Commit-Queue: Andrew Grieve <[email protected]> Owners-Override: Andrew Grieve <[email protected]> Cr-Commit-Position: refs/heads/main@{#1307572}
diff --git a/chrome/browser/platform_util_android.cc b/chrome/browser/platform_util_android.cc index 3854357..05a80ff 100644 --- a/chrome/browser/platform_util_android.cc +++ b/chrome/browser/platform_util_android.cc
@@ -8,11 +8,13 @@ #include "base/android/jni_string.h" #include "base/notreached.h" #include "chrome/browser/platform_util.h" -#include "chrome/browser/util/jni_headers/PlatformUtil_jni.h" #include "ui/android/view_android.h" #include "ui/android/window_android.h" #include "url/gurl.h" +// Must come after all headers that specialize FromJniType() / ToJniType(). +#include "chrome/browser/util/jni_headers/PlatformUtil_jni.h" + using base::android::ScopedJavaLocalRef; namespace platform_util {