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

Unified Diff: base/base.gyp

Issue 1519523002: [Android] Support conditional test disabling based on android.os.Build values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix one outdated use of SkipCheck Created 5 years 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: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 7408d058bf9a4a98648ba72776ed0d238d1dea40..dc484f4a4a62b0d2aa9804b29ba98c235dc7f7a3 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1588,7 +1588,7 @@
],
'variables': {
'src_paths': [
- '../base/test/android/junit/',
+ '../base/test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java',
],
},
'includes': [ '../build/host_jar.gypi' ]
@@ -1607,6 +1607,7 @@
'main_class': 'org.chromium.testing.local.JunitTestMain',
'src_paths': [
'../base/android/junit/',
+ '../base/test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java',
],
},
'includes': [ '../build/host_jar.gypi' ],
« no previous file with comments | « base/BUILD.gn ('k') | base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698