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

Side by Side Diff: content/public/android/BUILD.gn

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 | « content/gpu/gpu_child_thread.h ('k') | content/public/browser/BUILD.gn » ('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 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/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/android/rules.gni") 6 import("//build/config/android/rules.gni")
7 7
8 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py", 8 content_jni_gypi_values = exec_script("//build/gypi_to_gn.py",
9 [ rebase_path("../../content_jni.gypi") ], 9 [ rebase_path("../../content_jni.gypi") ],
10 "scope", 10 "scope",
(...skipping 22 matching lines...) Expand all
33 ":content_java_resources", 33 ":content_java_resources",
34 "//base:base_java", 34 "//base:base_java",
35 "//device/battery/android:battery_monitor_android", 35 "//device/battery/android:battery_monitor_android",
36 "//device/battery:mojo_bindings_java", 36 "//device/battery:mojo_bindings_java",
37 "//device/bluetooth:java", 37 "//device/bluetooth:java",
38 "//device/vibration/android:vibration_manager_android", 38 "//device/vibration/android:vibration_manager_android",
39 "//device/vibration:mojo_bindings_java", 39 "//device/vibration:mojo_bindings_java",
40 "//media/base/android:media_java", 40 "//media/base/android:media_java",
41 "//media/midi:midi_java", 41 "//media/midi:midi_java",
42 "//mojo/android:system_java", 42 "//mojo/android:system_java",
43 "//mojo/public/java:bindings",
44 "//mojo/public/java:system",
43 "//net/android:net_java", 45 "//net/android:net_java",
44 "//third_party/android_tools:android_support_v13_java", 46 "//third_party/android_tools:android_support_v13_java",
45 "//third_party/mojo/src/mojo/public/java:bindings",
46 "//third_party/mojo/src/mojo/public/java:system",
47 "//ui/accessibility:ui_accessibility_java", 47 "//ui/accessibility:ui_accessibility_java",
48 "//ui/android:ui_java", 48 "//ui/android:ui_java",
49 "//third_party/jsr-305:jsr_305_javalib", 49 "//third_party/jsr-305:jsr_305_javalib",
50 "//third_party/WebKit/public:blink_headers_java", 50 "//third_party/WebKit/public:blink_headers_java",
51 51
52 #"//content:content_common", 52 #"//content:content_common",
53 ] 53 ]
54 54
55 srcjar_deps = [ 55 srcjar_deps = [
56 ":common_aidl", 56 ":common_aidl",
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 "//base:base_java_test_support", 169 "//base:base_java_test_support",
170 "//content/public/test/android:content_java_test_support", 170 "//content/public/test/android:content_java_test_support",
171 "//content/shell/android:content_shell_java", 171 "//content/shell/android:content_shell_java",
172 "//content/shell/android:content_shell_java_resources", 172 "//content/shell/android:content_shell_java_resources",
173 "//content/shell/android:content_shell_apk_java", 173 "//content/shell/android:content_shell_apk_java",
174 "//content/shell/android:content_shell_test_java", 174 "//content/shell/android:content_shell_test_java",
175 "//device/vibration/android:vibration_manager_android", 175 "//device/vibration/android:vibration_manager_android",
176 "//device/vibration:mojo_bindings_java", 176 "//device/vibration:mojo_bindings_java",
177 "//media/base/android:media_java", 177 "//media/base/android:media_java",
178 "//mojo/android:system_java", 178 "//mojo/android:system_java",
179 "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
180 "//mojo/public/java:bindings",
181 "//mojo/public/java:system",
179 "//net/android:net_java", 182 "//net/android:net_java",
180 "//net/android:net_java_test_support", 183 "//net/android:net_java_test_support",
181 "//third_party/android_tools:android_support_v13_java", 184 "//third_party/android_tools:android_support_v13_java",
182 "//third_party/android_tools:legacy_http_javalib", 185 "//third_party/android_tools:legacy_http_javalib",
183 "//third_party/mojo/src/mojo/public/interfaces/bindings/tests:test_interface s_java",
184 "//third_party/mojo/src/mojo/public/java:bindings",
185 "//third_party/mojo/src/mojo/public/java:system",
186 "//ui/android:ui_java", 186 "//ui/android:ui_java",
187 ":content_java", 187 ":content_java",
188 ] 188 ]
189 189
190 DEPRECATED_java_in_dir = "javatests/src" 190 DEPRECATED_java_in_dir = "javatests/src"
191 } 191 }
192 192
193 # GYP: //content/content_tests.gypi:content_junit_tests 193 # GYP: //content/content_tests.gypi:content_junit_tests
194 junit_binary("content_junit_tests") { 194 junit_binary("content_junit_tests") {
195 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ] 195 java_files = [ "junit/src/org/chromium/content/browser/input/GamepadMappingsTe st.java" ]
196 deps = [ 196 deps = [
197 ":content_java", 197 ":content_java",
198 "//base:base_java", 198 "//base:base_java",
199 "//base:base_java_test_support", 199 "//base:base_java_test_support",
200 ] 200 ]
201 } 201 }
202 # TODO(GYP): content_icudata 202 # TODO(GYP): content_icudata
OLDNEW
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/public/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698