| 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/crypto.gni") | 6 import("//build/config/crypto.gni") |
| 7 import("//build/config/features.gni") | 7 import("//build/config/features.gni") |
| 8 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 9 | 9 |
| 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which | 10 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 if (is_win || is_mac) { | 782 if (is_win || is_mac) { |
| 783 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows | 783 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows |
| 784 # and Mac, so this test is meaningless. Can we merge these lists? | 784 # and Mac, so this test is meaningless. Can we merge these lists? |
| 785 sources += rebase_path( | 785 sources += rebase_path( |
| 786 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources, | 786 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources, |
| 787 ".", | 787 ".", |
| 788 "//chrome") | 788 "//chrome") |
| 789 } | 789 } |
| 790 } | 790 } |
| 791 if (enable_media_router) { | 791 if (enable_media_router) { |
| 792 deps += [ "//chrome/browser/media/router" ] |
| 792 defines += [ "ENABLE_MEDIA_ROUTER=1" ] | 793 defines += [ "ENABLE_MEDIA_ROUTER=1" ] |
| 793 } | 794 } |
| 794 } | 795 } |
| 795 | 796 |
| 796 if (is_android) { | 797 if (is_android) { |
| 797 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers | 798 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers |
| 798 generate_jni("jni_headers") { | 799 generate_jni("jni_headers") { |
| 799 sources = | 800 sources = |
| 800 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome") | 801 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome") |
| 801 jni_package = "chrome" | 802 jni_package = "chrome" |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1133 ] | 1134 ] |
| 1134 } | 1135 } |
| 1135 | 1136 |
| 1136 if (enable_wifi_bootstrapping) { | 1137 if (enable_wifi_bootstrapping) { |
| 1137 sources += [ | 1138 sources += [ |
| 1138 "local_discovery/wifi/mock_wifi_manager.cc", | 1139 "local_discovery/wifi/mock_wifi_manager.cc", |
| 1139 "local_discovery/wifi/mock_wifi_manager.h", | 1140 "local_discovery/wifi/mock_wifi_manager.h", |
| 1140 ] | 1141 ] |
| 1141 } | 1142 } |
| 1142 } | 1143 } |
| OLD | NEW |