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

Commit ccf022b4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[pm] Flag removal: force_multi_arch_native_libs_match" into main

parents b12a221f 8662ad28

core/java/android/content/pm/flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -198,14 +198,6 @@ flag { 
    is_fixed_read_only: true

}



flag {

    name: "force_multi_arch_native_libs_match"

    namespace: "package_manager_service"

    description: "Feature flag to force an multiArch app's native libraries to match with the natively supported ABIs of the device"

    bug: "282783453"

    is_fixed_read_only: true

}



flag {

    name: "set_pre_verified_domains"

    is_exported: true

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

+2 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import static com.android.server.pm.InstructionSets.getPrimaryInstructionSet; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ApplicationInfo;

import android.content.pm.Flags;

import android.content.pm.PackageManager;

import android.os.Build;

import android.os.Environment;
@@ -388,8 +387,8 @@ final class PackageAbiHelperImpl implements PackageAbiHelper { 
                // Force the match for these cases

                // 1. pkg.getTargetSdkVersion >= Build.VERSION_CODES.VANILLA_ICE_CREAM

                // 2. cpuAbiOverride is null. If it is non-null, it is set via shell for testing

                final boolean forceMatch = Flags.forceMultiArchNativeLibsMatch()

                        && pkg.getTargetSdkVersion() >= Build.VERSION_CODES.VANILLA_ICE_CREAM

                final boolean forceMatch =

                        pkg.getTargetSdkVersion() >= Build.VERSION_CODES.VANILLA_ICE_CREAM

                        && cpuAbiOverride == null;



                String[] supported32BitAbis = forceMatch ? getNativelySupported32BitAbis()