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

Side by Side Diff: ui/base/BUILD.gn

Issue 1531403002: Revert "Delete CC." (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 | « skia/BUILD.gn ('k') | no next file » | 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/ui.gni") 5 import("//build/config/ui.gni")
6 6
7 if (is_android) { 7 if (is_android) {
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/android/rules.gni") 9 import("//build/config/android/rules.gni")
10 } 10 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 if (use_x11) { 45 if (use_x11) {
46 #'all_dependent_settings': { 46 #'all_dependent_settings': {
47 #'ldflags': [ 47 #'ldflags': [
48 #'-L<(PRODUCT_DIR)', 48 #'-L<(PRODUCT_DIR)',
49 #], 49 #],
50 #}, 50 #},
51 configs += [ "//build/config/linux:x11" ] 51 configs += [ "//build/config/linux:x11" ]
52 } 52 }
53 53
54 if (is_android) { 54 if (is_android) {
55 deps += [ ":ui_base_jni_headers" ] 55 deps += [
56 ":ui_base_jni_headers",
57 "//cc",
58 ]
56 59
57 libs += [ "jnigraphics" ] 60 libs += [ "jnigraphics" ]
58 } 61 }
59 } 62 }
60 63
61 if (is_android) { 64 if (is_android) {
62 generate_jni("ui_base_jni_headers") { 65 generate_jni("ui_base_jni_headers") {
63 sources = [ 66 sources = [
64 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", 67 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
65 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", 68 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
66 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", 69 "../android/java/src/org/chromium/ui/base/ViewAndroid.java",
67 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", 70 "../android/java/src/org/chromium/ui/base/WindowAndroid.java",
68 ] 71 ]
69 jni_package = "base" 72 jni_package = "base"
70 } 73 }
71 } 74 }
OLDNEW
« no previous file with comments | « skia/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698