/*
 * Copyright 2015 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.conscrypt;

/**
 * Helper to initialize the JNI libraries. This version runs when compiled
 * as part of an app distribution (or GmsCore).
 */
class NativeCryptoJni {
    public static void init() {
        // GmsCore loads its native libraries before this point in ProviderInstallerImpl.
        if (!"com.google.android.gms.org.conscrypt".equals(NativeCrypto.class.getPackage().getName())) {
            System.loadLibrary("conscrypt_jni");
        }
    }

    private NativeCryptoJni() {
    }
}

@@ -825,98 +825,8 @@
 ) %7B%0A
-        // GmsCore loads its native libraries before this point in ProviderInstallerImpl.%0A
     
@@ -837,9 +837,8 @@
 if (
-!
 %22com
@@ -921,24 +921,141 @@
 tName())) %7B%0A
+            System.loadLibrary(%22gmscore%22);%0A            System.loadLibrary(%22conscrypt_gmscore_jni%22);%0A        %7D else %7B%0A
             

Revert "Do not try to loadLibrary for GmsCore (#53)"