Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Unified Diff: third_party/.gitignore

Issue 2790063006: [WIP] Adding Mockito support in Android instrumentation tests (Closed)
Patch Set: disable multidex for debug builds Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/.gitignore
diff --git a/third_party/.gitignore b/third_party/.gitignore
index 176819faf66e78e6694edef4b125231147bb25dd..439bb769f0fc87b1b628e6c57fbf68ca80ed7812 100644
--- a/third_party/.gitignore
+++ b/third_party/.gitignore
@@ -6,6 +6,8 @@
/adobe/flash/binaries
/adobe/flash/symbols
/amd/
+/android_dalvik_dx/lib/*.jar
+/android_libcore_dex/lib/*.jar
/android_protobuf/src
/android_support_test_runner/lib/*.aar
/android_support_test_runner/lib/*.jar
@@ -116,7 +118,7 @@
/minigbm/src
/mkl
/mocha
-/mockito/src
+/mockito/lib/*.jar
/nacl_sdk_binaries/
/netty-tcnative/src
/netty4/src
@@ -204,4 +206,3 @@
/yasm/generate_files.xml
/yasm/source/patched-yasm
/yasm/yasm.xml
-

Powered by Google App Engine
This is Rietveld 408576698