aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-01-31 17:24:33 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-01-31 17:24:33 +0000
commit6b259b2d875bfec874814bef124af049a725ff1a (patch)
treea2884eabc93b4fca33ac17529a258c95df78f90e
parentf7ac839ac98eb3e65d1afc4d5f8671d7b3355dc4 (diff)
parent9546fd37768ff5b1c70e184fdba432d3d73be02b (diff)
downloaddexmaker-6b259b2d875bfec874814bef124af049a725ff1a.tar.gz
Snap for 4577102 from 9546fd37768ff5b1c70e184fdba432d3d73be02b to pi-release
Change-Id: I5bbcc6a711a2671b775828c24343211874e6fc12
-rw-r--r--README.version1
-rw-r--r--dexmaker-tests/Android.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/README.version b/README.version
index c671035..55abaa3 100644
--- a/README.version
+++ b/README.version
@@ -11,3 +11,4 @@ It includes a stock code generator for class proxies. If you just want to do AOP
Local Modifications:
Allow to share classloader via dexmaker.share_classloader system property (I8c2490c3ec8e8582dc41c486f8f7a406bd635ebb)
Dynamically register transformation hook (I2556e749806bed4f80697d5cba38a8d8a2f7ce6a)
+ Use new attach API (I2be3ac3218c11f2ccf9a675fffd35f4fab548070)
diff --git a/dexmaker-tests/Android.mk b/dexmaker-tests/Android.mk
index ff8b050..e4950d2 100644
--- a/dexmaker-tests/Android.mk
+++ b/dexmaker-tests/Android.mk
@@ -27,6 +27,7 @@ LOCAL_MODULE := dexmaker-tests
LOCAL_SDK_VERSION := 17
LOCAL_SRC_FILES := $(call all-java-files-under, src/androidTest/java)
LOCAL_STATIC_JAVA_LIBRARIES := dexmaker android-support-test
+LOCAL_ERROR_PRONE_FLAGS := -Xep:JUnit4TestNotRun:WARN
include $(BUILD_STATIC_JAVA_LIBRARY)
# Build a test APK