112 lines
4.4 KiB
Diff
112 lines
4.4 KiB
Diff
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
|
index e00f78b4eb1c364028312c57629c74234265306e..7a4eec95efa9886b925bf34f33fbf8dfb3acdb2b 100644
|
|
--- a/chrome/BUILD.gn
|
|
+++ b/chrome/BUILD.gn
|
|
@@ -195,6 +195,7 @@ if (!is_android && !is_mac) {
|
|
"common/crash_keys.cc",
|
|
"common/crash_keys.h",
|
|
]
|
|
+ sources -= [ "app/chrome_exe.rc", ] sources += [ "//brave/app/brave_exe.rc", ] import("//brave/components/brave_origin/buildflags/buildflags.gni") if (is_brave_origin_branded) { defines += [ "IS_BRAVE_ORIGIN_BRANDED" ] }
|
|
|
|
deps += [
|
|
":chrome_dll",
|
|
@@ -511,11 +512,12 @@ if (is_win) {
|
|
args += [ "--keystone=0" ]
|
|
}
|
|
}
|
|
+ copy("brave_app_plist") { deps = [ "//brave:brave_app_plist" ] sources = [ "$root_gen_dir/brave/brave_app_plist_tweaked.plist" ] outputs = [ "$root_gen_dir/chrome/{{source_file_part}}" ] }
|
|
|
|
mac_app_bundle("chrome_app") {
|
|
output_name = chrome_product_full_name
|
|
|
|
- info_plist_target = ":chrome_app_plist"
|
|
+ info_plist_target = ":brave_app_plist"
|
|
extra_substitutions = [
|
|
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
|
|
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
|
|
@@ -535,6 +537,7 @@ if (is_win) {
|
|
"//chrome/common:buildflags",
|
|
"//chrome/common:version_header",
|
|
]
|
|
+ deps += [ "//brave:brave_app" ]
|
|
|
|
if (enable_updater) {
|
|
deps += [ ":chromium_updater_privileged_helper" ]
|
|
@@ -680,6 +683,7 @@ if (is_win) {
|
|
# this dependency directly copies the file into the framework's
|
|
# resources directory.
|
|
public_deps += [ ":chrome_framework_widevine_signature" ]
|
|
+ public_deps -= [ ":chrome_framework_widevine_signature" ]
|
|
}
|
|
}
|
|
|
|
@@ -723,9 +727,11 @@ if (is_win) {
|
|
"--scm=0",
|
|
]
|
|
}
|
|
+ copy("brave_helper_plist") { deps = [ "//brave:brave_helper_plist" ] sources = [ "$root_gen_dir/brave/brave_helper_plist_tweaked.plist" ] outputs = [ "$root_gen_dir/chrome/{{source_file_part}}" ] } import("//brave/browser/updater/buildflags.gni") import("//brave/updater/config.gni") # For enable_omaha4 and use_prebuilt_omaha4 below.
|
|
|
|
compile_entitlements("entitlements") {
|
|
entitlements_templates = [ "app/app-entitlements.plist" ]
|
|
+ entitlements_templates += brave_entitlements_templates
|
|
if (is_chrome_branded && include_branded_entitlements) {
|
|
# These entitlements are bound to the official Google Chrome signing
|
|
# certificate and will not necessarily work in any other build.
|
|
@@ -750,6 +756,7 @@ if (is_win) {
|
|
info_plist_target = invoker.info_plist_target
|
|
} else {
|
|
info_plist_target = ":chrome_helper_plist"
|
|
+ info_plist_target = ":brave_helper_plist"
|
|
}
|
|
|
|
extra_substitutions = [
|
|
@@ -933,6 +940,7 @@ if (is_win) {
|
|
if (enable_updater) {
|
|
if (is_chrome_branded) {
|
|
sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ]
|
|
+ } else if (!enable_omaha4) {} else if (use_prebuilt_omaha4) { sources += ["//brave/third_party/updater/mac/${updater_product_full_name}.app"]
|
|
} else {
|
|
sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
|
|
|
|
@@ -1224,6 +1232,7 @@ if (is_win) {
|
|
"-current_version",
|
|
chrome_dylib_version,
|
|
]
|
|
+ import("//brave/browser/sources.gni") public_deps += brave_chrome_framework_public_deps bundle_deps += brave_chrome_framework_bundle_deps framework_contents += brave_chrome_framework_contents
|
|
|
|
if (!is_component_build) {
|
|
# Specify a sensible install_name for static builds. The library is
|
|
@@ -1421,6 +1430,7 @@ if (is_win) {
|
|
|
|
group("dependencies") {
|
|
public_deps = [
|
|
+ "//brave:browser_dependencies",
|
|
"//build:branding_buildflags",
|
|
"//build:chromeos_buildflags",
|
|
"//chrome/browser",
|
|
@@ -1467,7 +1477,7 @@ group("dependencies") {
|
|
|
|
if (is_win) {
|
|
process_version_rc_template("chrome_exe_version") {
|
|
- sources = [ "app/chrome_exe.ver" ]
|
|
+ sources = [ "//brave/app/brave_exe.ver" ]
|
|
output = "$target_gen_dir/chrome_exe_version.rc"
|
|
}
|
|
|
|
@@ -1516,6 +1526,7 @@ group("resources") {
|
|
"//chrome/browser:resources",
|
|
"//chrome/common:resources",
|
|
"//chrome/renderer:resources",
|
|
+ "//brave:resources",
|
|
]
|
|
}
|
|
|
|
@@ -1570,6 +1581,7 @@ if (!is_android) {
|
|
if (enable_resource_allowlist_generation) {
|
|
repack_allowlist = _chrome_resource_allowlist
|
|
deps = [ ":resource_allowlist" ]
|
|
+ repack_allowlist = brave_allowlist_file deps += [ "//brave:merge_allowlists" ]
|
|
}
|
|
|
|
if (is_chrome_branded && !is_mac) {
|