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

Commit 8e60defe authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "Update locked_region_code_injection tool to ASM 6.0-BETA." am: 26817938 

am: e69366ff

Change-Id: Ieac3aadb7674ec63d4eed3d4d52f833e46d4a3a0
parents 97785398 e69366ff

tools/locked_region_code_injection/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -6,10 +6,10 @@ LOCAL_JAR_MANIFEST := manifest.txt 
LOCAL_MODULE := lockedregioncodeinjection

LOCAL_SRC_FILES := $(call all-java-files-under,src)

LOCAL_STATIC_JAVA_LIBRARIES := \

    asm-5.2 \

    asm-commons-5.2 \

    asm-tree-5.2 \

    asm-analysis-5.2 \

    asm-6.0_BETA \

    asm-commons-6.0_BETA \

    asm-tree-6.0_BETA \

    asm-analysis-6.0_BETA \

    guava-21.0 \



include $(BUILD_HOST_JAVA_LIBRARY)

tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class LockFindingClassVisitor extends ClassVisitor { 
        private MethodVisitor chain;



        public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) {

            super(Opcodes.ASM5, mn);

            super(Opcodes.ASM6, mn);

            assert owner != null;

            this.owner = owner;

            this.chain = chain;

tools/locked_region_code_injection/test/lockedregioncodeinjection/TestMain.java

+5 −2
Original line number Diff line number Diff line
@@ -23,11 +23,14 @@ import org.junit.Test; 
 * <code>

 * set -x

 *

 * croot frameworks/base/tools/locked_region_code_injection

 *

 * # Clean

 * mkdir -p out

 * rm -fr out/*

 *

 * # Make booster

 * javac -cp lib/asm-all-5.2.jar src&#47;*&#47;*.java -d out/

 * 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/

 * pushd out

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

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

 *

 * # Run tool on unit tests.

 * java -ea -cp lib/asm-all-5.2.jar:out/lockedregioncodeinjection.jar \

 * 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 \

 *     lockedregioncodeinjection.Main \

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

 *     --targets 'Llockedregioncodeinjection/TestTarget;' \