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

Commit 96bbb003 authored by Sorin Basca's avatar Sorin Basca Committed by Gerrit Code Review
Browse files

Merge "Updating locked_region_code_injection to use ASM7"

parents 2a1dc3a8 fc7aabcf

tools/locked_region_code_injection/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ java_binary_host { 
    manifest: "manifest.txt",

    srcs: ["src/**/*.java"],

    static_libs: [

        "asm-6.0",

        "asm-commons-6.0",

        "asm-tree-6.0",

        "asm-analysis-6.0",

        "asm-7.0",

        "asm-commons-7.0",

        "asm-tree-7.0",

        "asm-analysis-7.0",

        "guava-21.0",

    ],

}

tools/locked_region_code_injection/src/lockedregioncodeinjection/LockTargetStateAnalysis.java

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
 */

package lockedregioncodeinjection;



import java.util.ArrayList;

import java.util.List;

import org.objectweb.asm.Type;

import org.objectweb.asm.tree.AbstractInsnNode;

import org.objectweb.asm.tree.MethodInsnNode;
@@ -22,6 +20,9 @@ import org.objectweb.asm.tree.analysis.AnalyzerException; 
import org.objectweb.asm.tree.analysis.BasicInterpreter;

import org.objectweb.asm.tree.analysis.BasicValue;



import java.util.ArrayList;

import java.util.List;



/**

 * A simple dataflow analysis to determine if the operands on the stack must be one of target lock

 * class type.
@@ -31,6 +32,7 @@ public class LockTargetStateAnalysis extends BasicInterpreter { 
    private final List<LockTarget> targetLocks;



    public LockTargetStateAnalysis(List<LockTarget> targetLocks) {

        super(Utils.ASM_VERSION);

        this.targetLocks = targetLocks;

    }

tools/locked_region_code_injection/src/lockedregioncodeinjection/Utils.java

+3 −2
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ 
 */

package lockedregioncodeinjection;



import org.objectweb.asm.Opcodes;



import java.util.ArrayList;

import java.util.List;

import org.objectweb.asm.Opcodes;



public class Utils {



    public static final int ASM_VERSION = Opcodes.ASM6;

    public static final int ASM_VERSION = Opcodes.ASM7;



    /**

     * Reads a comma separated configuration similar to the Jack definition.

tools/locked_region_code_injection/test/lockedregioncodeinjection/TestMain.java

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import org.junit.Test; 
 * rm -fr out/*

 *

 * # Make booster

 * javac -cp lib/asm-6.0_BETA.jar:lib/asm-commons-6.0_BETA.jar:lib/asm-tree-6.0_BETA.jar:lib/asm-analysis-6.0_BETA.jar:lib/guava-21.0.jar src&#47;*&#47;*.java -d out/

 * javac -cp lib/asm-7.0_BETA.jar:lib/asm-commons-7.0_BETA.jar:lib/asm-tree-7.0_BETA.jar:lib/asm-analysis-7.0_BETA.jar:lib/guava-21.0.jar src&#47;*&#47;*.java -d out/

 * pushd out

 * jar cfe lockedregioncodeinjection.jar lockedregioncodeinjection.Main *&#47;*.class

 * popd
@@ -43,7 +43,7 @@ import org.junit.Test; 
 * popd

 *

 * # Run tool on unit tests.

 * java -ea -cp lib/asm-6.0_BETA.jar:lib/asm-commons-6.0_BETA.jar:lib/asm-tree-6.0_BETA.jar:lib/asm-analysis-6.0_BETA.jar:lib/guava-21.0.jar:out/lockedregioncodeinjection.jar \

 * java -ea -cp lib/asm-7.0_BETA.jar:lib/asm-commons-7.0_BETA.jar:lib/asm-tree-7.0_BETA.jar:lib/asm-analysis-7.0_BETA.jar:lib/guava-21.0.jar:out/lockedregioncodeinjection.jar \

 *     lockedregioncodeinjection.Main \

 *     -i out/test_input.jar -o out/test_output.jar \

 *     --targets 'Llockedregioncodeinjection/TestTarget;' \