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

Side by Side Diff: content/shell/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
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 import("//build_overrides/v8.gni") 7 import("//build_overrides/v8.gni")
8 import("//third_party/icu/config.gni") 8 import("//third_party/icu/config.gni")
9 9
10 generate_jni("content_shell_jni_headers") { 10 generate_jni("content_shell_jni_headers") {
(...skipping 28 matching lines...) Expand all
39 custom_package = "org.chromium.content_shell" 39 custom_package = "org.chromium.content_shell"
40 } 40 }
41 41
42 android_library("content_shell_java") { 42 android_library("content_shell_java") {
43 testonly = true 43 testonly = true
44 deps = [ 44 deps = [
45 "//base:base_java", 45 "//base:base_java",
46 "//content/public/android:content_java", 46 "//content/public/android:content_java",
47 "//media/base/android:media_java", 47 "//media/base/android:media_java",
48 "//net/android:net_java", 48 "//net/android:net_java",
49 "//third_party/mojo/src/mojo/public/java:system", 49 "//mojo/public/java:system",
50 "//ui/android:ui_java", 50 "//ui/android:ui_java",
51 ":content_shell_java_resources", 51 ":content_shell_java_resources",
52 ] 52 ]
53 DEPRECATED_java_in_dir = "java/src" 53 DEPRECATED_java_in_dir = "java/src"
54 } 54 }
55 55
56 content_shell_manifest = 56 content_shell_manifest =
57 "$target_gen_dir/content_shell_manifest/AndroidManifest.xml" 57 "$target_gen_dir/content_shell_manifest/AndroidManifest.xml"
58 58
59 jinja_template("content_shell_manifest") { 59 jinja_template("content_shell_manifest") {
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 217
218 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers 218 # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
219 generate_jni("linker_test_jni_headers") { 219 generate_jni("linker_test_jni_headers") {
220 testonly = true 220 testonly = true
221 jni_package = "content/shell" 221 jni_package = "content/shell"
222 sources = [ 222 sources = [
223 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a", 223 "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.jav a",
224 ] 224 ]
225 } 225 }
226 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698