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

Side by Side Diff: chrome/test/android/BUILD.gn

Issue 1206673003: Merge java_staging/src into java/src. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/android/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 # GYP: //chrome/chrome_tests.gypi:chrome_java_test_support 7 # GYP: //chrome/chrome_tests.gypi:chrome_java_test_support
8 android_library("chrome_java_test_support") { 8 android_library("chrome_java_test_support") {
9 testonly = true 9 testonly = true
10 DEPRECATED_java_in_dir = "javatests/src" 10 DEPRECATED_java_in_dir = "javatests/src"
(...skipping 16 matching lines...) Expand all
27 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_test_support_java 27 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_test_support_java
28 android_library("chrome_staging_test_support_java") { 28 android_library("chrome_staging_test_support_java") {
29 testonly = true 29 testonly = true
30 DEPRECATED_java_in_dir = "javatests_staging/src" 30 DEPRECATED_java_in_dir = "javatests_staging/src"
31 31
32 deps = [ 32 deps = [
33 "//base:base_java", 33 "//base:base_java",
34 "//base:base_java_test_support", 34 "//base:base_java_test_support",
35 "//chrome/android:chrome_java", 35 "//chrome/android:chrome_java",
36 "//chrome/android:chrome_java_resources", 36 "//chrome/android:chrome_java_resources",
37 "//chrome/android:chrome_staging_java",
38 "//chrome/test/android:chrome_java_test_support", 37 "//chrome/test/android:chrome_java_test_support",
39 "//components/bookmarks/common/android:bookmarks_java", 38 "//components/bookmarks/common/android:bookmarks_java",
40 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va", 39 "//components/web_contents_delegate_android:web_contents_delegate_android_ja va",
41 "//content/public/android:content_java", 40 "//content/public/android:content_java",
42 "//content/public/test/android:content_java_test_support", 41 "//content/public/test/android:content_java_test_support",
43 "//net/android:net_java", 42 "//net/android:net_java",
44 "//net/android:net_java_test_support", 43 "//net/android:net_java_test_support",
45 "//sync/android:sync_java", 44 "//sync/android:sync_java",
46 "//sync:sync_java_test_support", 45 "//sync:sync_java_test_support",
47 "//testing/android/reporter:reporter_java", 46 "//testing/android/reporter:reporter_java",
48 "//third_party/android_tools:android_support_v7_appcompat_java", 47 "//third_party/android_tools:android_support_v7_appcompat_java",
49 "//third_party/android_tools:android_support_v13_java", 48 "//third_party/android_tools:android_support_v13_java",
50 "//third_party/jsr-305:jsr_305_javalib", 49 "//third_party/jsr-305:jsr_305_javalib",
51 "//ui/android:ui_java", 50 "//ui/android:ui_java",
52 ] 51 ]
53 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698