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

Commit 4b114c29 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Replace some ByteBuffers with DataSource 

This avoids ByteArray 2GiB limit in a few places, but requires more
changes to SignApk to fully support large archives.

Bug: 302112430
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_RELEASE=trunk_staging CLANG_COVERAGE=true NATIVE_COVERAGE_PATHS="art external/aac external/boringssl external/conscrypt external/cpu_features external/dlmalloc external/fdlibm external/libaom external/libavc external/libcxx external/libfuse external/libgav1 external/libgsm external/libhevc external/libmpeg2 external/libopus external/libtextclassifier external/libvpx external/libxaac external/oj-libjdwp external/sonivox external/speex external/tremolo external/vixl frameworks/av frameworks/base/media libcore libnativehelper packages/modules/Bluetooth packages/modules/Connectivity packages/modules/DnsResolver packages/modules/ExtServices packages/modules/NetworkStack packages/modules/NeuralNetworks packages/modules/SdkExtensions packages/modules/StatsD packages/providers/MediaProvider system/core/base system/core/libcutils system/core/libstats system/media/audio_utils system/netd/resolv" com.android.art.testing
Change-Id: Ie7fc0bbce9ef43b6331143703ac5568cf1b2186a
parent 933d07a1

tools/signapk/src/com/android/signapk/SignApk.java

+20 −23
Original line number Diff line number Diff line
@@ -986,15 +986,14 @@ class SignApk { 
    }



    private static class ZipSections {

        ByteBuffer beforeCentralDir;

        DataSource beforeCentralDir;

        ByteBuffer centralDir;

        ByteBuffer eocd;

    }



    private static ZipSections findMainZipSections(ByteBuffer apk)

    private static ZipSections findMainZipSections(DataSource apk)

            throws IOException, ZipFormatException {

        apk.slice();

        ApkUtils.ZipSections sections = ApkUtils.findZipSections(DataSources.asDataSource(apk));

        ApkUtils.ZipSections sections = ApkUtils.findZipSections(apk);

        long centralDirStartOffset = sections.getZipCentralDirectoryOffset();

        long centralDirSizeBytes = sections.getZipCentralDirectorySizeBytes();

        long centralDirEndOffset = centralDirStartOffset + centralDirSizeBytes;
@@ -1005,25 +1004,18 @@ class SignApk { 
                            + ". CD end: " + centralDirEndOffset

                            + ", EoCD start: " + eocdStartOffset);

        }

        apk.position(0);

        apk.limit((int) centralDirStartOffset);

        ByteBuffer beforeCentralDir = apk.slice();



        apk.position((int) centralDirStartOffset);

        apk.limit((int) centralDirEndOffset);

        ByteBuffer centralDir = apk.slice();

        ZipSections result = new ZipSections();

        result.beforeCentralDir = apk.slice(0, centralDirStartOffset);



        apk.position((int) eocdStartOffset);

        apk.limit(apk.capacity());

        ByteBuffer eocd = apk.slice();

        long centralDirSize = centralDirEndOffset - centralDirStartOffset;

        if (centralDirSize >= Integer.MAX_VALUE) throw new IndexOutOfBoundsException();

        result.centralDir = apk.getByteBuffer(centralDirStartOffset, (int)centralDirSize);



        apk.position(0);

        apk.limit(apk.capacity());

        long eocdSize = apk.size() - eocdStartOffset;

        if (eocdSize >= Integer.MAX_VALUE) throw new IndexOutOfBoundsException();

        result.eocd = apk.getByteBuffer(eocdStartOffset, (int)eocdSize);



        ZipSections result = new ZipSections();

        result.beforeCentralDir = beforeCentralDir;

        result.centralDir = centralDir;

        result.eocd = eocd;

        return result;

    }
@@ -1300,7 +1292,8 @@ class SignApk { 
                    v1SignedApkBuf.reset();

                    ByteBuffer[] outputChunks = new ByteBuffer[] {v1SignedApk};



                    ZipSections zipSections = findMainZipSections(v1SignedApk);

                    ZipSections zipSections = findMainZipSections(DataSources.asDataSource(

                            v1SignedApk));



                    ByteBuffer eocd = ByteBuffer.allocate(zipSections.eocd.remaining());

                    eocd.put(zipSections.eocd);
@@ -1312,7 +1305,7 @@ class SignApk { 
                    while (true) {

                        ApkSignerEngine.OutputApkSigningBlockRequest2 addV2SignatureRequest =

                                apkSigner.outputZipSections2(

                                        DataSources.asDataSource(zipSections.beforeCentralDir),

                                        zipSections.beforeCentralDir,

                                        DataSources.asDataSource(zipSections.centralDir),

                                        DataSources.asDataSource(eocd));

                        if (addV2SignatureRequest == null) break;
@@ -1330,11 +1323,15 @@ class SignApk { 
                        modifiedEocd.order(ByteOrder.LITTLE_ENDIAN);

                        ApkUtils.setZipEocdCentralDirectoryOffset(

                                modifiedEocd,

                                zipSections.beforeCentralDir.remaining() + padding +

                                zipSections.beforeCentralDir.size() + padding +

                                apkSigningBlock.length);

                        if (zipSections.beforeCentralDir.size() >= Integer.MAX_VALUE) {

                            throw new IndexOutOfBoundsException();

                        }

                        outputChunks =

                                new ByteBuffer[] {

                                        zipSections.beforeCentralDir,

                                        zipSections.beforeCentralDir.getByteBuffer(0,

                                                (int)zipSections.beforeCentralDir.size()),

                                        ByteBuffer.allocate(padding),

                                        ByteBuffer.wrap(apkSigningBlock),

                                        zipSections.centralDir,