Bug 1637452: Part 5 - Fix JNI includes in tools/profiler; r=mstange
authorAaron Klotz <aklotz@mozilla.com>
Fri, 15 May 2020 17:04:19 +0000
changeset 530320 d10a511b49c331bdaa722ff50a78c679ec57fcbb
parent 530319 72ca0eb1f30bead7b7d3c0737ffb9eeaeea90d62
child 530321 4878cd1cdc0e7f4a10cd5359b638e1849af13044
push id37420
push usernerli@mozilla.com
push dateFri, 15 May 2020 21:52:36 +0000
treeherdermozilla-central@f340bbb582d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmstange
bugs1637452
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1637452: Part 5 - Fix JNI includes in tools/profiler; r=mstange In this bug we're moving away from monolithic JNI headers to class-specific headers so that we don't have to rebuild the world every time we make a change to a JNI interface. Differential Revision: https://phabricator.services.mozilla.com/D75368
tools/profiler/core/platform.cpp
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -89,18 +89,17 @@
 #include <sstream>
 #include <type_traits>
 
 #ifdef MOZ_TASK_TRACER
 #  include "GeckoTaskTracer.h"
 #endif
 
 #if defined(GP_OS_android)
-#  include "GeneratedJNINatives.h"
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/GeckoJavaSamplerNatives.h"
 #endif
 
 // Win32 builds always have frame pointers, so FramePointerStackWalk() always
 // works.
 #if defined(GP_PLAT_x86_windows)
 #  define HAVE_NATIVE_UNWIND
 #  define USE_FRAME_POINTER_STACK_WALK
 #endif