Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update locked_region_code_injection tool to ASM 6.0-BETA."

Browse Source 
am: 26817938f6

Change-Id: I193d04b7a4ebf0f39f60ac275a7eeb93499ded9d
This commit is contained in:
Tobias Thierer
2017-10-15 02:38:05 +00:00
committed by android-build-merger
parent 8279494137 26817938f6
commit e69366ff27
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/locked_region_code_injection/Android.mk
View File

@@ -6,10 +6,10 @@ LOCAL_JAR_MANIFEST := manifest.txt
LOCAL_MODULE := lockedregioncodeinjection LOCAL_MODULE := lockedregioncodeinjection
LOCAL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(call all-java-files-under,src)
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
asm-5.2 \ asm-6.0_BETA \
asm-commons-5.2 \ asm-commons-6.0_BETA \
asm-tree-5.2 \ asm-tree-6.0_BETA \
asm-analysis-5.2 \ asm-analysis-6.0_BETA \
guava-21.0 \ guava-21.0 \
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)

2
tools/locked_region_code_injection/src/lockedregioncodeinjection/LockFindingClassVisitor.java
View File

@@ -76,7 +76,7 @@ class LockFindingClassVisitor extends ClassVisitor {
private MethodVisitor chain; private MethodVisitor chain;
public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) { public LockFindingMethodVisitor(String owner, MethodNode mn, MethodVisitor chain) {
super(Opcodes.ASM5, mn); super(Opcodes.ASM6, mn);
assert owner != null; assert owner != null;
this.owner = owner; this.owner = owner;
this.chain = chain; this.chain = chain;

7
tools/locked_region_code_injection/test/lockedregioncodeinjection/TestMain.java
View File

@@ -23,11 +23,14 @@ import org.junit.Test;
* <code> * <code>
* set -x * set -x
* *
* croot frameworks/base/tools/locked_region_code_injection
*
* # Clean * # Clean
* mkdir -p out
* rm -fr out/* * rm -fr out/*
* *
* # Make booster * # 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 * pushd out
* jar cfe lockedregioncodeinjection.jar lockedregioncodeinjection.Main *&#47;*.class * jar cfe lockedregioncodeinjection.jar lockedregioncodeinjection.Main *&#47;*.class
* popd * popd
@@ -40,7 +43,7 @@ import org.junit.Test;
* popd * popd
* *
* # Run tool on unit tests. * # 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 \ * lockedregioncodeinjection.Main \
* -i out/test_input.jar -o out/test_output.jar \ * -i out/test_input.jar -o out/test_output.jar \
* --targets 'Llockedregioncodeinjection/TestTarget;' \ * --targets 'Llockedregioncodeinjection/TestTarget;' \