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

Side by Side Diff: components/web_contents_delegate_android/BUILD.gn

Issue 1460633005: Aura on Android: Remove unnecessary dependencies on ui/android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use assert(!use_aura). 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 | « no previous file | content/app/BUILD.gn » ('j') | ui/android/BUILD.gn » ('J')
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/rules.gni") 5 import("//build/config/android/rules.gni")
6 6
7 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android 7 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android
8 static_library("web_contents_delegate_android") { 8 static_library("web_contents_delegate_android") {
9 sources = [ 9 sources = [
10 "color_chooser_android.cc", 10 "color_chooser_android.cc",
11 "color_chooser_android.h", 11 "color_chooser_android.h",
12 "component_jni_registrar.cc", 12 "component_jni_registrar.cc",
13 "component_jni_registrar.h", 13 "component_jni_registrar.h",
14 "validation_message_bubble_android.cc", 14 "validation_message_bubble_android.cc",
15 "validation_message_bubble_android.h", 15 "validation_message_bubble_android.h",
16 "web_contents_delegate_android.cc", 16 "web_contents_delegate_android.cc",
17 "web_contents_delegate_android.h", 17 "web_contents_delegate_android.h",
18 ] 18 ]
19 19
20 deps = [ 20 deps = [
21 ":web_contents_delegate_android_jni_headers", 21 ":web_contents_delegate_android_jni_headers",
22 "//base", 22 "//base",
23 "//content/public/browser", 23 "//content/public/browser",
24 "//content/public/common", 24 "//content/public/common",
25 "//net", 25 "//net",
26 "//skia", 26 "//skia",
27 "//ui/android",
28 "//ui/base", 27 "//ui/base",
29 "//ui/gfx", 28 "//ui/gfx",
30 "//ui/gfx/geometry", 29 "//ui/gfx/geometry",
31 ] 30 ]
31
32 if (!use_aura) {
33 deps += [ "//ui/android" ]
no sievers 2015/11/19 22:23:09 this should not be needed since the aura build sho
Hadi 2015/11/19 22:38:04 (I replied in the discussion thread in the bottom
34 }
32 } 35 }
33 36
34 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ java 37 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ java
35 android_resources("web_contents_delegate_android_java_resources") { 38 android_resources("web_contents_delegate_android_java_resources") {
36 custom_package = "org.chromium.components.web_contents_delegate_android" 39 custom_package = "org.chromium.components.web_contents_delegate_android"
37 resource_dirs = [ "android/java/res" ] 40 resource_dirs = [ "android/java/res" ]
38 } 41 }
39 42
40 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ java 43 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ java
41 android_library("web_contents_delegate_android_java") { 44 android_library("web_contents_delegate_android_java") {
42 deps = [ 45 deps = [
43 ":web_contents_delegate_android_java_resources", 46 ":web_contents_delegate_android_java_resources",
44 "//base:base_java", 47 "//base:base_java",
45 "//ui/android:ui_java", 48 "//ui/android:ui_java",
46 "//content/public/android:content_java", 49 "//content/public/android:content_java",
47 "//content/public/android:content_java_resources", 50 "//content/public/android:content_java_resources",
48 ] 51 ]
49 DEPRECATED_java_in_dir = "android/java/src" 52 DEPRECATED_java_in_dir = "android/java/src"
50 } 53 }
51 54
52 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ jni_headers 55 # GYP: //components/web_contents_delegate_android:web_contents_delegate_android_ jni_headers
53 generate_jni("web_contents_delegate_android_jni_headers") { 56 generate_jni("web_contents_delegate_android_jni_headers") {
54 sources = [ 57 sources = [
55 "android/java/src/org/chromium/components/web_contents_delegate_android/Colo rChooserAndroid.java", 58 "android/java/src/org/chromium/components/web_contents_delegate_android/Colo rChooserAndroid.java",
56 "android/java/src/org/chromium/components/web_contents_delegate_android/Vali dationMessageBubble.java", 59 "android/java/src/org/chromium/components/web_contents_delegate_android/Vali dationMessageBubble.java",
57 "android/java/src/org/chromium/components/web_contents_delegate_android/WebC ontentsDelegateAndroid.java", 60 "android/java/src/org/chromium/components/web_contents_delegate_android/WebC ontentsDelegateAndroid.java",
58 ] 61 ]
59 jni_package = "web_contents_delegate_android" 62 jni_package = "web_contents_delegate_android"
60 } 63 }
OLDNEW
« no previous file with comments | « no previous file | content/app/BUILD.gn » ('j') | ui/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698