Bug 1448428 - Part 3: Transition EnterpriseRoots away from unified GeneratedJNIWrappers.h header; r=keeler
authorAaron Klotz <aklotz@mozilla.com>
Wed, 13 May 2020 18:01:22 +0000
changeset 529697 6a8277223f6d9e40b0edc84499870a9e64354d6d
parent 529696 ba407e8fac926e45ae60535fe32333e5995850e9
child 529698 6a0cd004fa71b854f321889b13c047e387851247
push id37414
push usernbeleuzu@mozilla.com
push dateThu, 14 May 2020 02:40:10 +0000
treeherdermozilla-central@045d696faa87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1448428
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 1448428 - Part 3: Transition EnterpriseRoots away from unified GeneratedJNIWrappers.h header; r=keeler Depends on D58575 Differential Revision: https://phabricator.services.mozilla.com/D75159
security/manager/ssl/EnterpriseRoots.cpp
--- a/security/manager/ssl/EnterpriseRoots.cpp
+++ b/security/manager/ssl/EnterpriseRoots.cpp
@@ -8,17 +8,17 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Logging.h"
 #include "mozilla/Unused.h"
 #include "mozpkix/Result.h"
 #include "nsThreadUtils.h"
 
 #ifdef MOZ_WIDGET_ANDROID
-#  include "GeneratedJNIWrappers.h"
+#  include "mozilla/java/EnterpriseRootsWrappers.h"
 #endif  // MOZ_WIDGET_ANDROID
 
 #ifdef XP_MACOSX
 #  include <Security/Security.h>
 #  include "KeychainSecret.h"  // for ScopedCFType
 
 #  include "nsCocoaFeatures.h"
 #endif  // XP_MACOSX