| OLD | NEW |
| 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 Loading... |
| 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 += [ | 55 deps += [ ":ui_base_jni_headers" ] |
| 56 ":ui_base_jni_headers", | |
| 57 "//cc", | |
| 58 ] | |
| 59 | 56 |
| 60 libs += [ "jnigraphics" ] | 57 libs += [ "jnigraphics" ] |
| 61 } | 58 } |
| 62 } | 59 } |
| 63 | 60 |
| 64 if (is_android) { | 61 if (is_android) { |
| 65 generate_jni("ui_base_jni_headers") { | 62 generate_jni("ui_base_jni_headers") { |
| 66 sources = [ | 63 sources = [ |
| 67 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", | 64 "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java", |
| 68 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", | 65 "../android/java/src/org/chromium/ui/base/SelectFileDialog.java", |
| 69 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", | 66 "../android/java/src/org/chromium/ui/base/ViewAndroid.java", |
| 70 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", | 67 "../android/java/src/org/chromium/ui/base/WindowAndroid.java", |
| 71 ] | 68 ] |
| 72 jni_package = "base" | 69 jni_package = "base" |
| 73 } | 70 } |
| 74 } | 71 } |
| OLD | NEW |