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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 1140183002: Revert of Media Router GYP/GN cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months 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 | « build/config/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | 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/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 777 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 if (is_win || is_mac) { 788 if (is_win || is_mac) {
789 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows 789 # TODO(brettw) as of this writing wifi bootstrapping is set on Windows
790 # and Mac, so this test is meaningless. Can we merge these lists? 790 # and Mac, so this test is meaningless. Can we merge these lists?
791 sources += rebase_path( 791 sources += rebase_path(
792 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources, 792 gypi_values.chrome_browser_wifi_bootstrapping_win_mac_sources,
793 ".", 793 ".",
794 "//chrome") 794 "//chrome")
795 } 795 }
796 } 796 }
797 if (enable_media_router) { 797 if (enable_media_router) {
798 deps += [ "//chrome/browser/media/router" ] 798 defines += [ "ENABLE_MEDIA_ROUTER=1" ]
799 } 799 }
800 } 800 }
801 801
802 if (is_android) { 802 if (is_android) {
803 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers 803 # GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers
804 generate_jni("jni_headers") { 804 generate_jni("jni_headers") {
805 sources = 805 sources =
806 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome") 806 rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
807 jni_package = "chrome" 807 jni_package = "chrome"
808 } 808 }
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1139 ] 1139 ]
1140 } 1140 }
1141 1141
1142 if (enable_wifi_bootstrapping) { 1142 if (enable_wifi_bootstrapping) {
1143 sources += [ 1143 sources += [
1144 "local_discovery/wifi/mock_wifi_manager.cc", 1144 "local_discovery/wifi/mock_wifi_manager.cc",
1145 "local_discovery/wifi/mock_wifi_manager.h", 1145 "local_discovery/wifi/mock_wifi_manager.h",
1146 ] 1146 ]
1147 } 1147 }
1148 } 1148 }
OLDNEW
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/browser/extensions/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698