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

Unified Diff: chrome/BUILD.gn

Issue 571863002: GN: Get //chrome/* mostly working on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/BUILD.gn
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index ba69e8f6d6c90bb85baa9f89099224da8eecfa21..423aa5b656bd6918c0d3d235558870ecaf36271b 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -8,6 +8,8 @@ import("//build/config/ui.gni")
import("//chrome/chrome_repack_locales.gni")
import("//chrome/version.gni")
+if (!is_android) {
+
# TODO(GYP) for Windows need to the the reorder-imports step which probably
# means adding another target and renaming this to chrome_initial like in GYP.
executable("chrome") {
@@ -104,14 +106,16 @@ executable("chrome") {
}
- if (!is_mac && !is_android) {
- # On Mac this is done in chrome_dll.gypi. Android doesn't use pdfium.
+ if (!is_mac) {
+ # On Mac this is done in chrome_dll.gypi.
datadeps += [ "//pdf" ]
# TODO(GYP) pdf linux symbols
}
}
+} # !is_android
+
shared_library("main_dll") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -372,8 +376,6 @@ repack("packed_extra_resources") {
"$root_gen_dir/blink/public/resources/blink_resources.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/content_resources.pak",
- "$root_gen_dir/extensions/extensions_renderer_resources.pak",
- "$root_gen_dir/extensions/extensions_resources.pak",
]
}
if (is_chromeos) {
@@ -381,7 +383,11 @@ repack("packed_extra_resources") {
deps += [ "//ui/file_manager:resources" ]
}
if (enable_extensions) {
- sources += [ "$root_gen_dir/chrome/extensions_api_resources.pak" ]
+ sources += [
+ "$root_gen_dir/chrome/extensions_api_resources.pak",
+ "$root_gen_dir/extensions/extensions_renderer_resources.pak",
+ "$root_gen_dir/extensions/extensions_resources.pak",
+ ]
deps += [ "//chrome/common:extensions_api_resources" ]
}
« no previous file with comments | « build/config/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698