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

Side by Side Diff: base/BUILD.gn

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 unified diff | Download patch
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/compiler/compiler.gni") 5 import("//build/config/compiler/compiler.gni")
6 import("//build/config/nacl/config.gni") 6 import("//build/config/nacl/config.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/nocompile.gni") 8 import("//build/nocompile.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 1711 matching lines...) Expand 10 before | Expand all | Expand 10 after
1722 "//third_party/robolectric:android-all-4.3_r2-robolectric-0", 1722 "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
1723 "//third_party/robolectric:robolectric_java", 1723 "//third_party/robolectric:robolectric_java",
1724 ] 1724 ]
1725 } 1725 }
1726 1726
1727 # GYP: //base.gyp:base_junit_tests 1727 # GYP: //base.gyp:base_junit_tests
1728 junit_binary("base_junit_tests") { 1728 junit_binary("base_junit_tests") {
1729 java_files = [ 1729 java_files = [
1730 "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java", 1730 "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java",
1731 "android/junit/src/org/chromium/base/LogTest.java", 1731 "android/junit/src/org/chromium/base/LogTest.java",
1732 "test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java",
1732 ] 1733 ]
1733 deps = [ 1734 deps = [
1734 ":base_java", 1735 ":base_java",
1735 ":base_java_test_support", 1736 ":base_java_test_support",
1736 ":base_junit_test_support", 1737 ":base_junit_test_support",
1737 ] 1738 ]
1738 } 1739 }
1739 1740
1740 # GYP: //base.gyp:base_java_application_state 1741 # GYP: //base.gyp:base_java_application_state
1741 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes 1742 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
(...skipping 29 matching lines...) Expand all
1771 1772
1772 # GYP: //base.gyp:base_java_unittest_support 1773 # GYP: //base.gyp:base_java_unittest_support
1773 android_library("base_java_unittest_support") { 1774 android_library("base_java_unittest_support") {
1774 deps = [ 1775 deps = [
1775 ":base_java", 1776 ":base_java",
1776 ] 1777 ]
1777 java_files = 1778 java_files =
1778 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1779 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1779 } 1780 }
1780 } 1781 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698