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

Unified Diff: chrome/BUILD.gn

Issue 1991903002: [Mac/GN] Include Chrome default_apps in the framework bundle. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | 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 afe1e986e579d21606e370b2b3cfc57dc44e528c..45e8339021694fca83c4d1d38c14a9c9f8dc7471 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -753,6 +753,10 @@ if (is_win) {
"//chrome/app/nibs:chrome_xibs",
]
+ if (is_chrome_branded) {
+ deps += [ ":default_apps" ]
+ }
+
ldflags = [
"-Wl,-install_name,@executable_path/../Versions/$chrome_version_full/$chrome_framework_name.framework/$chrome_framework_name",
"-compatibility_version",
@@ -959,8 +963,21 @@ group("extra_resources") {
}
if (is_chrome_branded) {
- copy("default_apps") {
+ if (!is_mac) {
+ _default_apps_target_type = "copy"
+ } else {
+ _default_apps_target_type = "bundle_data"
+ }
+
+ target(_default_apps_target_type, "default_apps") {
visibility = [ ":packed_resources" ]
+ if (is_mac) {
+ visibility += [
+ ":chrome_framework",
+ ":chrome_framework_shared_library",
+ ]
+ }
+
sources = [
"browser/resources/default_apps/docs.crx",
"browser/resources/default_apps/drive.crx",
@@ -968,9 +985,16 @@ if (is_chrome_branded) {
"browser/resources/default_apps/gmail.crx",
"browser/resources/default_apps/youtube.crx",
]
- outputs = [
- "$root_out_dir/default_apps/{{source_file_part}}",
- ]
+
+ if (!is_mac) {
+ outputs = [
+ "$root_out_dir/default_apps/{{source_file_part}}",
+ ]
+ } else {
+ outputs = [
+ "{{bundle_root_dir}}/Deafult Apps/{{source_file_part}}",
+ ]
+ }
# Force anybody that depends on this to get the default apps as data files.
data = process_file_template(sources, outputs)
@@ -984,7 +1008,7 @@ group("packed_resources") {
":repack_pseudo_locales_pack",
]
- if (is_chrome_branded) {
+ if (is_chrome_branded && !is_mac) {
public_deps += [ ":default_apps" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698