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

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

Issue 1498273002: Revert of Aura Android: upstream platform_util* related files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix conflict 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 | « no previous file | chrome/browser/platform_util_aura.cc » ('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 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 "//ui/gl", 379 "//ui/gl",
380 "//ui/resources", 380 "//ui/resources",
381 "//ui/surface", 381 "//ui/surface",
382 "//ui/web_dialogs", 382 "//ui/web_dialogs",
383 "//v8", 383 "//v8",
384 ] 384 ]
385 385
386 if (toolkit_views) { 386 if (toolkit_views) {
387 deps += [ "//ui/views" ] 387 deps += [ "//ui/views" ]
388 } 388 }
389
390 if (is_android && use_aura) {
391 sources -= [
392 # Aura Android uses platform_util_aura implementation.
393 "platform_util_android.cc",
394 ]
395 }
396 } else { # iOS 389 } else { # iOS
397 sources += 390 sources +=
398 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome") 391 rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome")
399 sources += 392 sources +=
400 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome") 393 rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
401 deps += [ "//net" ] 394 deps += [ "//net" ]
402 libs += [ 395 libs += [
403 "CoreTelephony.framework", 396 "CoreTelephony.framework",
404 "CoreText.framework", 397 "CoreText.framework",
405 "MobileCoreServices.framework", 398 "MobileCoreServices.framework",
(...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1320 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1328 deps = [ 1321 deps = [
1329 "//components/google/core/browser", 1322 "//components/google/core/browser",
1330 "//components/omnibox/browser", 1323 "//components/omnibox/browser",
1331 "//components/rlz", 1324 "//components/rlz",
1332 "//components/search_engines", 1325 "//components/search_engines",
1333 "//rlz:rlz_lib", 1326 "//rlz:rlz_lib",
1334 ] 1327 ]
1335 } 1328 }
1336 } 1329 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/platform_util_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698