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

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

Merge "Don't extract libs when pageSizeCompat disabled" into main

parents 5f5442d2 2ec4ed50

core/java/android/content/pm/parsing/ApkLite.java

+20 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.content.pm.parsing; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ApplicationInfo;

import android.content.pm.ArchivedPackageParcel;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;
@@ -184,6 +185,11 @@ public class ApkLite { 
     */

    private final @Nullable ArchivedPackageParcel mArchivedPackage;



    /**

     *  pageSizeCompat info from manifest file

     */

    private final int mPageSizeCompat;



    public ApkLite(String path, String packageName, String splitName, boolean isFeatureSplit,

            String configForSplit, String usesSplitName, boolean isSplitRequired, int versionCode,

            int versionCodeMajor, int revisionCode, int installLocation,
@@ -200,7 +206,8 @@ public class ApkLite { 
            List<String> usesStaticLibraries, long[] usesStaticLibrariesVersionsMajor,

            String[][] usesStaticLibrariesCertDigests,

            boolean updatableSystem,

            String emergencyInstaller, List<SharedLibraryInfo> declaredLibraries) {

            String emergencyInstaller, List<SharedLibraryInfo> declaredLibraries,

            int pageSizeCompat) {

        mPath = path;

        mPackageName = packageName;

        mSplitName = splitName;
@@ -245,6 +252,7 @@ public class ApkLite { 
        mEmergencyInstaller = emergencyInstaller;

        mArchivedPackage = null;

        mDeclaredLibraries = declaredLibraries;

        mPageSizeCompat = pageSizeCompat;

    }



    public ApkLite(String path, ArchivedPackageParcel archivedPackage) {
@@ -292,6 +300,7 @@ public class ApkLite { 
        mEmergencyInstaller = null;

        mArchivedPackage = archivedPackage;

        mDeclaredLibraries = null;

        mPageSizeCompat = ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED;

    }



    /**
@@ -676,11 +685,19 @@ public class ApkLite { 
        return mArchivedPackage;

    }



    /**

     *  pageSizeCompat info from manifest file

     */

    @DataClass.Generated.Member

    public int getPageSizeCompat() {

        return mPageSizeCompat;

    }



    @DataClass.Generated(

            time = 1731589363302L,

            time = 1738189581427L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/ApkLite.java",

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mRevisionCode\nprivate final  int mInstallLocation\nprivate final  int mMinSdkVersion\nprivate final  int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final  boolean mFeatureSplit\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mProfileableByShell\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final  boolean mOverlayIsStatic\nprivate final  int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final  int mRollbackDataPolicy\nprivate final  boolean mHasDeviceAdminReceiver\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mIsStaticLibrary\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesSdkLibraries\nprivate final @android.annotation.Nullable long[] mUsesSdkLibrariesVersionsMajor\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesSdkLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesStaticLibraries\nprivate final @android.annotation.Nullable long[] mUsesStaticLibrariesVersions\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesStaticLibrariesCertDigests\nprivate final  boolean mUpdatableSystem\nprivate final @android.annotation.Nullable java.lang.String mEmergencyInstaller\nprivate final @android.annotation.NonNull java.util.List<android.content.pm.SharedLibraryInfo> mDeclaredLibraries\nprivate final @android.annotation.Nullable android.content.pm.ArchivedPackageParcel mArchivedPackage\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.Nullable java.lang.String mSplitName\nprivate final @android.annotation.Nullable java.lang.String mUsesSplitName\nprivate final @android.annotation.Nullable java.lang.String mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mRevisionCode\nprivate final  int mInstallLocation\nprivate final  int mMinSdkVersion\nprivate final  int mTargetSdkVersion\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final  boolean mFeatureSplit\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mProfileableByShell\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mUseEmbeddedDex\nprivate final @android.annotation.Nullable java.lang.String mTargetPackageName\nprivate final  boolean mOverlayIsStatic\nprivate final  int mOverlayPriority\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyName\nprivate final @android.annotation.Nullable java.lang.String mRequiredSystemPropertyValue\nprivate final  int mRollbackDataPolicy\nprivate final  boolean mHasDeviceAdminReceiver\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mIsStaticLibrary\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesSdkLibraries\nprivate final @android.annotation.Nullable long[] mUsesSdkLibrariesVersionsMajor\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesSdkLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesStaticLibraries\nprivate final @android.annotation.Nullable long[] mUsesStaticLibrariesVersions\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesStaticLibrariesCertDigests\nprivate final  boolean mUpdatableSystem\nprivate final @android.annotation.Nullable java.lang.String mEmergencyInstaller\nprivate final @android.annotation.NonNull java.util.List<android.content.pm.SharedLibraryInfo> mDeclaredLibraries\nprivate final @android.annotation.Nullable android.content.pm.ArchivedPackageParcel mArchivedPackage\nprivate final  int mPageSizeCompat\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass ApkLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

    @Deprecated

    private void __metadata() {}

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+7 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.os.Trace.TRACE_TAG_PACKAGE_MANAGER; 


import android.annotation.NonNull;

import android.app.admin.DeviceAdminReceiver;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.SharedLibraryInfo;
@@ -459,6 +460,7 @@ public class ApkLiteParseUtils { 
        boolean overlayIsStatic = false;

        int overlayPriority = 0;

        int rollbackDataPolicy = 0;

        int pageSizeCompat = ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED;



        String requiredSystemPropertyName = null;

        String requiredSystemPropertyValue = null;
@@ -516,6 +518,10 @@ public class ApkLiteParseUtils { 
                boolean hasBindDeviceAdminPermission =

                        android.Manifest.permission.BIND_DEVICE_ADMIN.equals(permission);



                pageSizeCompat = parser.getAttributeIntValue(ANDROID_RES_NAMESPACE,

                        "pageSizeCompat",

                        ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_UNDEFINED);



                final int innerDepth = parser.getDepth();

                int innerType;

                while ((innerType = parser.next()) != XmlPullParser.END_DOCUMENT
@@ -817,7 +823,7 @@ public class ApkLiteParseUtils { 
                        usesSdkLibrariesVersionsMajor, usesSdkLibrariesCertDigests, isStaticLibrary,

                        usesStaticLibraries, usesStaticLibrariesVersions,

                        usesStaticLibrariesCertDigests, updatableSystem, emergencyInstaller,

                        declaredLibraries));

                        declaredLibraries, pageSizeCompat));

    }



    private static ParseResult<String[]> parseAdditionalCertificates(ParseInput input,

core/java/android/content/pm/parsing/PackageLite.java

+16 −2
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ public class PackageLite { 
     */

    private final @Nullable ArchivedPackageParcel mArchivedPackage;



    /**

     *  pageSizeCompat info from manifest file

     */

    private final int mPageSizeCompat;



    public PackageLite(String path, String baseApkPath, ApkLite baseApk,

            String[] splitNames, boolean[] isFeatureSplits, String[] usesSplitNames,

            String[] configForSplit, String[] splitApkPaths, int[] splitRevisionCodes,
@@ -182,6 +187,7 @@ public class PackageLite { 
        mTargetSdk = targetSdk;

        mDeclaredLibraries = baseApk.getDeclaredLibraries();

        mArchivedPackage = baseApk.getArchivedPackage();

        mPageSizeCompat = baseApk.getPageSizeCompat();

    }



    /**
@@ -511,11 +517,19 @@ public class PackageLite { 
        return mArchivedPackage;

    }



    /**

     *  pageSizeCompat info from manifest file

     */

    @DataClass.Generated.Member

    public int getPageSizeCompat() {

        return mPageSizeCompat;

    }



    @DataClass.Generated(

            time = 1731591578587L,

            time = 1738193799106L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/content/pm/parsing/PackageLite.java",

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mTargetSdk\nprivate final  int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final  int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mProfileableByShell\nprivate final  boolean mUseEmbeddedDex\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mIsStaticLibrary\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesSdkLibraries\nprivate final @android.annotation.Nullable long[] mUsesSdkLibrariesVersionsMajor\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesSdkLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesStaticLibraries\nprivate final @android.annotation.Nullable long[] mUsesStaticLibrariesVersions\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesStaticLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<android.content.pm.SharedLibraryInfo> mDeclaredLibraries\nprivate final @android.annotation.Nullable android.content.pm.ArchivedPackageParcel mArchivedPackage\npublic  java.util.List<java.lang.String> getAllApkPaths()\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

            inputSignatures = "private final @android.annotation.NonNull java.lang.String mPackageName\nprivate final @android.annotation.NonNull java.lang.String mPath\nprivate final @android.annotation.NonNull java.lang.String mBaseApkPath\nprivate final @android.annotation.Nullable java.lang.String[] mSplitApkPaths\nprivate final @android.annotation.Nullable java.lang.String[] mSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mUsesSplitNames\nprivate final @android.annotation.Nullable java.lang.String[] mConfigForSplit\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String> mBaseRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mRequiredSplitTypes\nprivate final @android.annotation.Nullable java.util.Set<java.lang.String>[] mSplitTypes\nprivate final  int mVersionCodeMajor\nprivate final  int mVersionCode\nprivate final  int mTargetSdk\nprivate final  int mBaseRevisionCode\nprivate final @android.annotation.Nullable int[] mSplitRevisionCodes\nprivate final  int mInstallLocation\nprivate final @android.annotation.NonNull android.content.pm.VerifierInfo[] mVerifiers\nprivate final @android.annotation.NonNull android.content.pm.SigningDetails mSigningDetails\nprivate final @android.annotation.Nullable boolean[] mIsFeatureSplits\nprivate final  boolean mIsolatedSplits\nprivate final  boolean mSplitRequired\nprivate final  boolean mCoreApp\nprivate final  boolean mDebuggable\nprivate final  boolean mMultiArch\nprivate final  boolean mUse32bitAbi\nprivate final  boolean mExtractNativeLibs\nprivate final  boolean mProfileableByShell\nprivate final  boolean mUseEmbeddedDex\nprivate final  boolean mIsSdkLibrary\nprivate final  boolean mIsStaticLibrary\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesSdkLibraries\nprivate final @android.annotation.Nullable long[] mUsesSdkLibrariesVersionsMajor\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesSdkLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<java.lang.String> mUsesStaticLibraries\nprivate final @android.annotation.Nullable long[] mUsesStaticLibrariesVersions\nprivate final @android.annotation.Nullable java.lang.String[][] mUsesStaticLibrariesCertDigests\nprivate final @android.annotation.NonNull java.util.List<android.content.pm.SharedLibraryInfo> mDeclaredLibraries\nprivate final @android.annotation.Nullable android.content.pm.ArchivedPackageParcel mArchivedPackage\nprivate final  int mPageSizeCompat\npublic  java.util.List<java.lang.String> getAllApkPaths()\npublic  long getLongVersionCode()\nprivate  boolean hasAnyRequiredSplitTypes()\nclass PackageLite extends java.lang.Object implements []\n@com.android.internal.util.DataClass(genConstructor=false, genConstDefs=false)")

    @Deprecated

    private void __metadata() {}

core/java/com/android/internal/content/NativeLibraryHelper.java

+18 −7
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ public class NativeLibraryHelper { 
        final boolean extractNativeLibs;

        final boolean debuggable;



        final boolean pageSizeCompatDisabled;



        public static Handle create(File packageFile) throws IOException {

            final ParseTypeImpl input = ParseTypeImpl.forDefaultParsing();

            final ParseResult<PackageLite> ret = ApkLiteParseUtils.parsePackageLite(input.reset(),
@@ -97,12 +99,15 @@ public class NativeLibraryHelper { 
        }



        public static Handle create(PackageLite lite) throws IOException {

            boolean isPageSizeCompatDisabled = lite.getPageSizeCompat()

                    == ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED;

            return create(lite.getAllApkPaths(), lite.isMultiArch(), lite.isExtractNativeLibs(),

                    lite.isDebuggable());

                    lite.isDebuggable(), isPageSizeCompatDisabled);

        }



        public static Handle create(List<String> codePaths, boolean multiArch,

                boolean extractNativeLibs, boolean debuggable) throws IOException {

                boolean extractNativeLibs, boolean debuggable, boolean isPageSizeCompatDisabled)

                throws IOException {

            final int size = codePaths.size();

            final String[] apkPaths = new String[size];

            final long[] apkHandles = new long[size];
@@ -119,7 +124,8 @@ public class NativeLibraryHelper { 
                }

            }



            return new Handle(apkPaths, apkHandles, multiArch, extractNativeLibs, debuggable);

            return new Handle(apkPaths, apkHandles, multiArch, extractNativeLibs, debuggable,

                    isPageSizeCompatDisabled);

        }



        public static Handle createFd(PackageLite lite, FileDescriptor fd) throws IOException {
@@ -130,17 +136,21 @@ public class NativeLibraryHelper { 
                throw new IOException("Unable to open APK " + path + " from fd " + fd);

            }



            boolean isPageSizeCompatDisabled = lite.getPageSizeCompat()

                    == ApplicationInfo.PAGE_SIZE_APP_COMPAT_FLAG_MANIFEST_OVERRIDE_DISABLED;



            return new Handle(new String[]{path}, apkHandles, lite.isMultiArch(),

                    lite.isExtractNativeLibs(), lite.isDebuggable());

                    lite.isExtractNativeLibs(), lite.isDebuggable(), isPageSizeCompatDisabled);

        }



        Handle(String[] apkPaths, long[] apkHandles, boolean multiArch,

                boolean extractNativeLibs, boolean debuggable) {

                boolean extractNativeLibs, boolean debuggable, boolean isPageSizeCompatDisabled) {

            this.apkPaths = apkPaths;

            this.apkHandles = apkHandles;

            this.multiArch = multiArch;

            this.extractNativeLibs = extractNativeLibs;

            this.debuggable = debuggable;

            this.pageSizeCompatDisabled = isPageSizeCompatDisabled;

            mGuard.open("close");

        }
@@ -175,7 +185,8 @@ public class NativeLibraryHelper { 
    private static native long nativeSumNativeBinaries(long handle, String cpuAbi);



    private native static int nativeCopyNativeBinaries(long handle, String sharedLibraryPath,

            String abiToCopy, boolean extractNativeLibs, boolean debuggable);

            String abiToCopy, boolean extractNativeLibs, boolean debuggable,

            boolean pageSizeCompatDisabled);



    private static native int nativeCheckAlignment(

            long handle,
@@ -203,7 +214,7 @@ public class NativeLibraryHelper { 
    public static int copyNativeBinaries(Handle handle, File sharedLibraryDir, String abi) {

        for (long apkHandle : handle.apkHandles) {

            int res = nativeCopyNativeBinaries(apkHandle, sharedLibraryDir.getPath(), abi,

                    handle.extractNativeLibs, handle.debuggable);

                    handle.extractNativeLibs, handle.debuggable, handle.pageSizeCompatDisabled);

            if (res != INSTALL_SUCCEEDED) {

                return res;

            }

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+17 −7
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip 
    jboolean extractNativeLibs = *(jboolean*)args[1];

    jboolean debuggable = *(jboolean*)args[2];

    jboolean app_compat_16kb = *(jboolean*)args[3];

    jboolean pageSizeCompatDisabled = *(jboolean*)args[4];

    install_status_t ret = INSTALL_SUCCEEDED;



    ScopedUtfChars nativeLibPath(env, *javaNativeLibPath);
@@ -304,6 +305,16 @@ static install_status_t copyFileIfChanged(JNIEnv* env, void* arg, ZipFileRO* zip 
        }



        if (offset % kPageSize != 0) {

            // If page size app compat was disabled explicitly in manifest, don't extract libs on

            // 16 KB page size device.

            if (kPageSize == 0x4000 && pageSizeCompatDisabled) {

                ALOGE("pageSizeCompat=disabled library '%s' is not PAGE(%zu)-"

                      "aligned within apk (APK alignment, not ELF alignment) -"

                      "and will not be extracted.\n",

                      fileName, kPageSize);

                return INSTALL_FAILED_INVALID_APK;

            }



            // If the library is zip-aligned correctly for 4kb devices and app compat is

            // enabled, on 16kb devices fallback to extraction

            if (offset % 0x1000 == 0 && app_compat_16kb) {
@@ -537,13 +548,12 @@ static inline bool app_compat_16kb_enabled() { 
    return !android::base::GetBoolProperty("pm.16kb.app_compat.disabled", false);

}



static jint

com_android_internal_content_NativeLibraryHelper_copyNativeBinaries(JNIEnv *env, jclass clazz,

        jlong apkHandle, jstring javaNativeLibPath, jstring javaCpuAbi,

        jboolean extractNativeLibs, jboolean debuggable)

{

static jint com_android_internal_content_NativeLibraryHelper_copyNativeBinaries(

        JNIEnv* env, jclass clazz, jlong apkHandle, jstring javaNativeLibPath, jstring javaCpuAbi,

        jboolean extractNativeLibs, jboolean debuggable, jboolean pageSizeCompatDisabled) {

    jboolean app_compat_16kb = app_compat_16kb_enabled();

    void* args[] = { &javaNativeLibPath, &extractNativeLibs, &debuggable, &app_compat_16kb };

    void* args[] = {&javaNativeLibPath, &extractNativeLibs, &debuggable, &app_compat_16kb,

                    &pageSizeCompatDisabled};

    return (jint) iterateOverNativeFiles(env, apkHandle, javaCpuAbi,

            copyFileIfChanged, reinterpret_cast<void*>(args));

}
@@ -804,7 +814,7 @@ static const JNINativeMethod gMethods[] = { 
        {"nativeOpenApkFd", "(Ljava/io/FileDescriptor;Ljava/lang/String;)J",

         (void*)com_android_internal_content_NativeLibraryHelper_openApkFd},

        {"nativeClose", "(J)V", (void*)com_android_internal_content_NativeLibraryHelper_close},

        {"nativeCopyNativeBinaries", "(JLjava/lang/String;Ljava/lang/String;ZZ)I",

        {"nativeCopyNativeBinaries", "(JLjava/lang/String;Ljava/lang/String;ZZZ)I",

         (void*)com_android_internal_content_NativeLibraryHelper_copyNativeBinaries},

        {"nativeSumNativeBinaries", "(JLjava/lang/String;)J",

         (void*)com_android_internal_content_NativeLibraryHelper_sumNativeBinaries},