| 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 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 import("//third_party/WebKit/Source/bindings/bindings.gni") | 7 import("//third_party/WebKit/Source/bindings/bindings.gni") |
| 8 import("//third_party/WebKit/Source/config.gni") | 8 import("//third_party/WebKit/Source/config.gni") |
| 9 import("//third_party/WebKit/Source/core/core.gni") | 9 import("//third_party/WebKit/Source/core/core.gni") |
| 10 import("//third_party/WebKit/Source/modules/modules.gni") | 10 import("//third_party/WebKit/Source/modules/modules.gni") |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 sources += bindings_unittest_files | 136 sources += bindings_unittest_files |
| 137 sources += core_unittest_files | 137 sources += core_unittest_files |
| 138 sources += modules_unittest_files | 138 sources += modules_unittest_files |
| 139 sources += platform_unittest_support_files | 139 sources += platform_unittest_support_files |
| 140 sources += platform_web_unittest_files | 140 sources += platform_web_unittest_files |
| 141 } | 141 } |
| 142 | 142 |
| 143 if (is_android) { | 143 if (is_android) { |
| 144 apk_deps = [ | 144 apk_deps = [ |
| 145 "//base:base_java", | 145 "//base:base_java", |
| 146 "//content/shell/android:content_shell_assets", |
| 146 "//net/android:net_java", | 147 "//net/android:net_java", |
| 147 "//content/shell/android:copy_content_shell_assets", | |
| 148 ] | 148 ] |
| 149 apk_asset_location = "$root_build_dir/content_shell/assets" | |
| 150 } | 149 } |
| 151 } | 150 } |
| OLD | NEW |