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

Commit c6687daa authored by Jeff Hao's avatar Jeff Hao
Browse files

Handle shared libraries for split apks. 

As we dexopt all the code paths of a package, we now append the code
paths to the list of shared libraries. These paths are passed as
relative paths since the apks are staged during installation, and are
not where they will be at runtime.

Part of a multi-project change.

Bug: 34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests

(cherry-picked from commit 832641bb)

Change-Id: I28b1f8db6035ec62a5947679ed09013b1f9523a2
parent 4132f860

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

+20 −3
Original line number Diff line number Diff line
@@ -149,13 +149,14 @@ public class PackageDexOptimizer { 
        final boolean profileUpdated = checkForProfileUpdates &&

                isProfileUpdated(pkg, sharedGid, compilerFilter);



        // TODO(calin,jeffhao): shared library paths should be adjusted to include previous code

        // paths (b/34169257).

        final String sharedLibrariesPath = getSharedLibrariesPath(sharedLibraries);

        String sharedLibrariesPath = getSharedLibrariesPath(sharedLibraries);

        // Get the dexopt flags after getRealCompilerFilter to make sure we get the correct flags.

        final int dexoptFlags = getDexFlags(pkg, compilerFilter);



        int result = DEX_OPT_SKIPPED;

        // TODO: Iterate based on dependency hierarchy (currently alphabetically by name)

        // (b/37480811).

        String basePathCheck = null;

        for (String path : paths) {

            for (String dexCodeIsa : dexCodeInstructionSets) {

                int newResult = dexOptPath(pkg, path, dexCodeIsa, compilerFilter, profileUpdated,
@@ -167,6 +168,22 @@ public class PackageDexOptimizer { 
                if ((result != DEX_OPT_FAILED) && (newResult != DEX_OPT_SKIPPED)) {

                    result = newResult;

                }

                // Add the relative path of code we just compiled to the shared libraries.

                int slashIndex = path.lastIndexOf('/') + 1;

                String relativePath = path.substring(slashIndex);

                if (sharedLibrariesPath == null) {

                    sharedLibrariesPath = relativePath;

                } else {

                    sharedLibrariesPath += ":" + relativePath;

                }

                // Sanity check that the base paths are all the same.

                String basePath = path.substring(0, slashIndex);

                if (basePathCheck == null) {

                    basePathCheck = basePath;

                } else if (!basePath.equals(basePathCheck)) {

                    Slog.wtf(TAG, "Split paths have different base paths: " + basePath + " and " +

                        basePathCheck);

                }

            }

        }

        return result;