Merge "Fix dependencies of packages that target earlier releases"

am: bde4c9a8df

Change-Id: I24ee27f2d99de7cee6aace00b3d721cd91fff3d4
This commit is contained in:
Paul Duffin 2017-06-15 05:15:01 +00:00 committed by android-build-merger
commit c44dd5a879

View file

@ -26,8 +26,9 @@ LOCAL_AAPT_FLAGS += -0 .txt
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \ android-support-test \
mockito-target \ mockito-target
legacy-android-test
LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)