diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-23 07:31:53 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-23 07:31:53 +0000 |
| commit | 5e9fc8cabdd7abeff45cf30962ddb3c519a6e3ab (patch) | |
| tree | 8571159c189128540d5d39335ca6fa8921de97ea | |
| parent | 2fe7888f256ae0e25985ca9e684011a1d7bec1ae (diff) | |
| parent | 28bd6571b68001826663e7a91a0feedee089ee4f (diff) | |
| download | misc-5e9fc8cabdd7abeff45cf30962ddb3c519a6e3ab.tar.gz | |
release-request-e64ca0c4-2b43-4758-b238-0b8c6fabc365-for-git_oc-mr1-release-4207446 snap-temp-L19600000085022555
Change-Id: I9959baba8339daecb7e68400cba4cb48fc2afa54
| -rw-r--r-- | common/android-support-test/Android.mk | 2 | ||||
| -rw-r--r-- | common/ddmlib/PREBUILT | 4 | ||||
| -rw-r--r-- | common/ddmlib/ddmlib-prebuilt.jar | bin | 325707 -> 328949 bytes |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/android-support-test/Android.mk b/common/android-support-test/Android.mk index edbff9a2..12becddb 100644 --- a/common/android-support-test/Android.mk +++ b/common/android-support-test/Android.mk @@ -54,7 +54,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := espresso-core LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 15 -LOCAL_STATIC_JAVA_LIBRARIES := espresso-core-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations +LOCAL_STATIC_JAVA_LIBRARIES := espresso-core-nodep espresso-idling-resource-nodep android-support-test-rules-nodep android-support-test-runner-nodep junit hamcrest hamcrest-library android-support-annotations jsr330 include $(BUILD_STATIC_JAVA_LIBRARY) include $(CLEAR_VARS) diff --git a/common/ddmlib/PREBUILT b/common/ddmlib/PREBUILT index 4033bffc..174adda1 100644 --- a/common/ddmlib/PREBUILT +++ b/common/ddmlib/PREBUILT @@ -1,9 +1,9 @@ The object in this prebuilt directory can be built from platform/tools/base -From the commit 2ad592512e878d4b16f82af85ab0cdb09f683ade +From the commit f764d774fbdf4fa7cf258b2e8c328a458a9aca53 -Jar is obtained from git_studio-master-dev@4152598 +Jar is obtained from git_studio-master-dev@4058845 Note: Before dropping the ddmlib-prebuilt.jar, please run the following command to strip the jar manifest file, diff --git a/common/ddmlib/ddmlib-prebuilt.jar b/common/ddmlib/ddmlib-prebuilt.jar Binary files differindex 2e4c8e01..42cde73a 100644 --- a/common/ddmlib/ddmlib-prebuilt.jar +++ b/common/ddmlib/ddmlib-prebuilt.jar |