Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit a4304899 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Add Cronet

parent 2e644277

.gitignore

+4 −0
Original line number Original line Diff line number Diff line
@@ -7,3 +7,7 @@ build/ 
user.gradle

user.gradle

local.properties

local.properties

.directory

.directory



.settings

.classpath

.project

build.gradle

+1 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */

 */





buildscript {

buildscript {

    ext.cronetVersion = '91.0.4472.120'

    ext.nlpVersion = '2.0-alpha6'

    ext.nlpVersion = '2.0-alpha6'

    ext.remoteDroidGuardVersion = '0.1.2'

    ext.remoteDroidGuardVersion = '0.1.2'

    ext.safeParcelVersion = '1.7.0'

    ext.safeParcelVersion = '1.7.0'

play-services-core/build.gradle

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ dependencies { 
    implementation project(':play-services-base-core')

    implementation project(':play-services-base-core')

    implementation project(':play-services-base-core-ui')

    implementation project(':play-services-base-core-ui')

    implementation project(':play-services-conscrypt-provider-core')

    implementation project(':play-services-conscrypt-provider-core')

    implementation project(':play-services-cronet-core')

    implementation project(':play-services-location-core')

    implementation project(':play-services-location-core')

    implementation project(':play-services-vision-core')

    implementation project(':play-services-vision-core')

    withNearbyImplementation project(':play-services-nearby-core')

    withNearbyImplementation project(':play-services-nearby-core')

play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteContext.java

+16 −11
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ public class DynamiteContext extends ContextWrapper { 
    private Context gmsContext;

    private Context gmsContext;

    private DynamiteContext appContext;

    private DynamiteContext appContext;





    private ClassLoader classLoader;



    public DynamiteContext(DynamiteModuleInfo moduleInfo, Context base, Context gmsContext, DynamiteContext appContext) {

    public DynamiteContext(DynamiteModuleInfo moduleInfo, Context base, Context gmsContext, DynamiteContext appContext) {

        super(base);

        super(base);

        this.moduleInfo = moduleInfo;

        this.moduleInfo = moduleInfo;
@@ -38,6 +40,7 @@ public class DynamiteContext extends ContextWrapper { 




    @Override

    @Override

    public ClassLoader getClassLoader() {

    public ClassLoader getClassLoader() {

        if (classLoader == null) {

            StringBuilder nativeLoaderDirs = new StringBuilder(gmsContext.getApplicationInfo().nativeLibraryDir);

            StringBuilder nativeLoaderDirs = new StringBuilder(gmsContext.getApplicationInfo().nativeLibraryDir);

            if (Build.VERSION.SDK_INT >= 23 && Process.is64Bit()) {

            if (Build.VERSION.SDK_INT >= 23 && Process.is64Bit()) {

                for (String abi : Build.SUPPORTED_64_BIT_ABIS) {

                for (String abi : Build.SUPPORTED_64_BIT_ABIS) {
@@ -50,7 +53,9 @@ public class DynamiteContext extends ContextWrapper { 
            } else {

            } else {

                nativeLoaderDirs.append(File.pathSeparator).append(gmsContext.getApplicationInfo().sourceDir).append("!/lib/").append(Build.CPU_ABI);

                nativeLoaderDirs.append(File.pathSeparator).append(gmsContext.getApplicationInfo().sourceDir).append("!/lib/").append(Build.CPU_ABI);

            }

            }

        return new PathClassLoader(gmsContext.getApplicationInfo().sourceDir, nativeLoaderDirs.toString(), new FilteredClassLoader(originalContext.getClassLoader(), moduleInfo.getMergedClasses(), moduleInfo.getMergedPackages()));

            classLoader = new PathClassLoader(gmsContext.getApplicationInfo().sourceDir, nativeLoaderDirs.toString(), new FilteredClassLoader(originalContext.getClassLoader(), moduleInfo.getMergedClasses(), moduleInfo.getMergedPackages()));

        }

        return classLoader;

    }

    }





    @Override

    @Override

play-services-cronet-core/build.gradle

0 → 100644
+38 −0
Original line number Original line Diff line number Diff line 
/*

 * SPDX-FileCopyrightText: 2021, microG Project Team

 * SPDX-License-Identifier: Apache-2.0

 */



apply plugin: 'com.android.library'

apply plugin: 'maven-publish'

apply plugin: 'signing'



dependencies {

    implementation("org.microg:cronet-api:$cronetVersion")

    implementation("org.microg:cronet-common:$cronetVersion")

    implementation("org.microg:cronet-native:$cronetVersion")

}



android {

    compileSdkVersion androidCompileSdk

    buildToolsVersion "$androidBuildVersionTools"



    defaultConfig {

        versionName version

        minSdkVersion androidMinSdk

        targetSdkVersion androidTargetSdk

    }



    lintOptions {

        disable 'MissingTranslation'

    }



    compileOptions {

        sourceCompatibility = 1.8

        targetCompatibility = 1.8

    }

}



apply from: '../gradle/publish-android.gradle'



description = 'microG service implementation for play-services-cronet'