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

Commit cf93319a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "dexopt: Drop native libraries from the class loader context." into sc-dev am: cb302ae4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15055237

Change-Id: I6a6233dd0fceb868bd73513e50cbc188b3334418
parents 19295e63 cb302ae4

services/core/java/com/android/server/pm/PackageDexOptimizer.java

+3 −1
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ public class PackageDexOptimizer { 
    private int performDexOptLI(AndroidPackage pkg, @NonNull PackageSetting pkgSetting,

            String[] targetInstructionSets, CompilerStats.PackageStats packageStats,

            PackageDexUsage.PackageUseInfo packageUseInfo, DexoptOptions options) {

        // ClassLoader only refers non-native (jar) shared libraries and must ignore

        // native (so) shared libraries. See also LoadedApk#createSharedLibraryLoader().

        final List<SharedLibraryInfo> sharedLibraries = pkgSetting.getPkgState()

                .getUsesLibraryInfos();

                .getNonNativeUsesLibraryInfos();

        final String[] instructionSets = targetInstructionSets != null ?

                targetInstructionSets : getAppDexInstructionSets(

                AndroidPackageUtils.getPrimaryCpuAbi(pkg, pkgSetting),

services/core/java/com/android/server/pm/pkg/PackageStateUnserialized.java

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.server.pm.PackageSetting; 


import java.util.ArrayList;

import java.util.List;

import java.util.stream.Collectors;



/**

 * For use by {@link PackageSetting} to maintain functionality that used to exist in
@@ -110,6 +111,10 @@ public class PackageStateUnserialized { 
        this.overrideSeInfo = other.overrideSeInfo;

    }



    public @NonNull List<SharedLibraryInfo> getNonNativeUsesLibraryInfos() {

        return getUsesLibraryInfos().stream()

                .filter((l) -> !l.isNative()).collect(Collectors.toList());

    }





    // Code below generated by codegen v1.0.14.