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

Commit 0ca16fa5 authored by Tamas Berghammer's avatar Tamas Berghammer Committed by Andreas Gampe
Browse files

Enable logwrapper functionality on user builds 

When an app is debuggable, check whether a script called "wrap.sh" exists
in the app's native library directory. If so, start the app using the
invoke-with functionality over the script. Weaken the invoke-with check
on the zygote side to allow the functionality for debuggable apps.

The goal of the functionality is to make malloc debug, strace and other
similar tools available for NDK based application developers.

Bug: 33668201
Test: manual - debug malloc can be enabled using the new feature
Change-Id: Ia4bec0854cf4dc08446f1671494200f54ef366ee
parent b8f7c351

core/java/android/os/Process.java

+2 −1
Original line number Diff line number Diff line
@@ -399,7 +399,8 @@ public class Process { 
     * <var>processClass</var> to start them.

     * 

     * When invokeWith is not null, the process will be started as a fresh app

     * and not a zygote fork. Note that this is only allowed for uid 0.

     * and not a zygote fork. Note that this is only allowed for uid 0 or when

     * debugFlags contains DEBUG_ENABLE_DEBUGGER.

     *

     * @param processClass The class to use as the process's main entry

     *                     point.

core/java/android/os/ZygoteProcess.java

+2 −1
Original line number Diff line number Diff line
@@ -171,7 +171,8 @@ public class ZygoteProcess { 
     * <var>processClass</var> to start them.

     *

     * When invokeWith is not null, the process will be started as a fresh app

     * and not a zygote fork. Note that this is only allowed for uid 0.

     * and not a zygote fork. Note that this is only allowed for uid 0 or when

     * debugFlags contains DEBUG_ENABLE_DEBUGGER.

     *

     * @param processClass The class to use as the process's main entry

     *                     point.

core/java/com/android/internal/os/ZygoteConnection.java

+5 −3
Original line number Diff line number Diff line
@@ -697,9 +697,11 @@ class ZygoteConnection { 
            throws ZygoteSecurityException {

        int peerUid = peer.getUid();



        if (args.invokeWith != null && peerUid != 0) {

            throw new ZygoteSecurityException("Peer is not permitted to specify "

                    + "an explicit invoke-with wrapper command");

        if (args.invokeWith != null && peerUid != 0 &&

            (args.debugFlags & Zygote.DEBUG_ENABLE_DEBUGGER) == 0) {

            throw new ZygoteSecurityException("Peer is permitted to specify an"

                    + "explicit invoke-with wrapper command only for debuggable"

                    + "applications.");

        }

    }

services/core/java/com/android/server/am/ActivityManagerService.java

+10 −1
Original line number Diff line number Diff line
@@ -3783,6 +3783,15 @@ public final class ActivityManagerService extends ActivityManagerNative 
                mNativeDebuggingApp = null;

            }













            String invokeWith = null;













            if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {













                // Debuggable apps may include a wrapper script with their library directory.













                String wrapperFileName = app.info.nativeLibraryDir + "/wrap.sh";













                if (new File(wrapperFileName).exists()) {













                    invokeWith = "/system/bin/logwrapper " + wrapperFileName;













                }













            }



























            String requiredAbi = (abiOverride != null) ? abiOverride : app.info.primaryCpuAbi;















            if (requiredAbi == null) {















                requiredAbi = Build.SUPPORTED_ABIS[0];










@@ -3814,7 +3823,7 @@ public final class ActivityManagerService extends ActivityManagerNative













                startResult = Process.start(entryPoint,















                        app.processName, uid, uid, gids, debugFlags, mountExternal,















                        app.info.targetSdkVersion, app.info.seinfo, requiredAbi, instructionSet,













                        app.info.dataDir, null, entryPointArgs);













                        app.info.dataDir, invokeWith, entryPointArgs);















            }















            checkTime(startTime, "startProcess: returned from zygote!");















            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);