chromium: separate patches for beta and dev builds
fixes beta and dev builds
This commit is contained in:
Herwig Hochleitner
Franz Pletz
parent
dffd77b037
commit
93aaeaccc2
@ -90,6 +90,15 @@ let
|
|||||||
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
|
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
versionRange = min-version: upto-version:
|
||||||
|
let inherit (upstream-info) version;
|
||||||
|
result = versionAtLeast version min-version && versionOlder version upto-version;
|
||||||
|
stable-version = (import ./upstream-info.nix).stable.version;
|
||||||
|
in if versionAtLeast stable-version upto-version
|
||||||
|
then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
|
||||||
|
result
|
||||||
|
else result;
|
||||||
|
|
||||||
base = rec {
|
base = rec {
|
||||||
name = "${packageName}-${version}";
|
name = "${packageName}-${version}";
|
||||||
inherit (upstream-info) version;
|
inherit (upstream-info) version;
|
||||||
@ -117,15 +126,31 @@ let
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./patches/nix_plugin_paths_52.patch
|
./patches/nix_plugin_paths_52.patch
|
||||||
|
# To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
|
||||||
|
# Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
|
||||||
|
./patches/fix_network_api_crash.patch
|
||||||
|
] # As major versions are added, you can trawl the gentoo and arch repos at
|
||||||
|
# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
|
||||||
|
# https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
|
||||||
|
# for updated patches and hints about build flags
|
||||||
|
++ optionals (versionRange "61" "62") [
|
||||||
./patches/chromium-gn-bootstrap-r14.patch
|
./patches/chromium-gn-bootstrap-r14.patch
|
||||||
./patches/chromium-gcc-r1.patch
|
./patches/chromium-gcc-r1.patch
|
||||||
./patches/chromium-atk-r1.patch
|
./patches/chromium-atk-r1.patch
|
||||||
./patches/chromium-gcc5-r1.patch
|
./patches/chromium-gcc5-r1.patch
|
||||||
# To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
|
]
|
||||||
# Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
|
++ optionals (versionRange "62" "63") [
|
||||||
./patches/fix_network_api_crash.patch
|
./patches/chromium-gn-bootstrap-r17.patch
|
||||||
|
./patches/chromium-gcc5-r2.patch
|
||||||
] ++ optional enableWideVine ./patches/widevine.patch;
|
./patches/chromium-glibc2.26-r1.patch
|
||||||
|
]
|
||||||
|
++ optionals (versionAtLeast version "63") [
|
||||||
|
./patches/chromium-gn-bootstrap-r19.patch
|
||||||
|
./patches/chromium-gcc5-r2.patch
|
||||||
|
./patches/chromium-glibc2.26-r1.patch
|
||||||
|
./patches/chromium-sysroot-r1.patch
|
||||||
|
]
|
||||||
|
++ optional enableWideVine ./patches/widevine.patch;
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
|
||||||
|
|||||||
@ -0,0 +1,36 @@
|
|||||||
|
--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
|
||||||
|
+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
|
||||||
|
@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
|
||||||
|
allocation_length_(0),
|
||||||
|
data_(data),
|
||||||
|
data_length_(0),
|
||||||
|
- kind_(AllocationKind::kNormal),
|
||||||
|
+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
|
||||||
|
deleter_(deleter) {}
|
||||||
|
DataHandle(void* allocation_base,
|
||||||
|
size_t allocation_length,
|
||||||
|
@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
|
||||||
|
reinterpret_cast<uintptr_t>(allocation_base_) +
|
||||||
|
allocation_length_);
|
||||||
|
switch (kind_) {
|
||||||
|
- case AllocationKind::kNormal:
|
||||||
|
+ case WTF::ArrayBufferContents::AllocationKind::kNormal:
|
||||||
|
DCHECK(deleter_);
|
||||||
|
deleter_(data_);
|
||||||
|
return;
|
||||||
|
- case AllocationKind::kReservation:
|
||||||
|
+ case WTF::ArrayBufferContents::AllocationKind::kReservation:
|
||||||
|
ReleaseReservedMemory(allocation_base_, allocation_length_);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
|
||||||
|
+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
|
||||||
|
#include "webrtc/modules/audio_processing/aec3/aec_state.h"
|
||||||
|
|
||||||
|
-#include <math.h>
|
||||||
|
+#include <cmath>
|
||||||
|
#include <numeric>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
@ -0,0 +1,220 @@
|
|||||||
|
diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
index c80724d..052ce37 100644
|
||||||
|
--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
@@ -36,19 +36,19 @@ namespace google_breakpad {
|
||||||
|
|
||||||
|
// Minidump defines register structures which are different from the raw
|
||||||
|
// structures which we get from the kernel. These are platform specific
|
||||||
|
-// functions to juggle the ucontext and user structures into minidump format.
|
||||||
|
+// functions to juggle the ucontext_t and user structures into minidump format.
|
||||||
|
|
||||||
|
#if defined(__i386__)
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gregs[REG_ESP];
|
||||||
|
}
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gregs[REG_EIP];
|
||||||
|
}
|
||||||
|
|
||||||
|
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
const struct _libc_fpstate* fp) {
|
||||||
|
const greg_t* regs = uc->uc_mcontext.gregs;
|
||||||
|
|
||||||
|
@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
|
#elif defined(__x86_64)
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gregs[REG_RSP];
|
||||||
|
}
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gregs[REG_RIP];
|
||||||
|
}
|
||||||
|
|
||||||
|
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
const struct _libc_fpstate* fpregs) {
|
||||||
|
const greg_t* regs = uc->uc_mcontext.gregs;
|
||||||
|
|
||||||
|
@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
|
#elif defined(__ARM_EABI__)
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.arm_sp;
|
||||||
|
}
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.arm_pc;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
|
||||||
|
out->context_flags = MD_CONTEXT_ARM_FULL;
|
||||||
|
|
||||||
|
out->iregs[0] = uc->uc_mcontext.arm_r0;
|
||||||
|
@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
|
||||||
|
|
||||||
|
#elif defined(__aarch64__)
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.sp;
|
||||||
|
}
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.pc;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
const struct fpsimd_context* fpregs) {
|
||||||
|
out->context_flags = MD_CONTEXT_ARM64_FULL;
|
||||||
|
|
||||||
|
@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
|
||||||
|
#elif defined(__mips__)
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
|
||||||
|
}
|
||||||
|
|
||||||
|
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
return uc->uc_mcontext.pc;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
|
||||||
|
#if _MIPS_SIM == _ABI64
|
||||||
|
out->context_flags = MD_CONTEXT_MIPS64_FULL;
|
||||||
|
#elif _MIPS_SIM == _ABIO32
|
||||||
|
diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
index b6e77b4..2de80b7 100644
|
||||||
|
--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
+++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
@@ -39,23 +39,23 @@
|
||||||
|
|
||||||
|
namespace google_breakpad {
|
||||||
|
|
||||||
|
-// Wraps platform-dependent implementations of accessors to ucontext structs.
|
||||||
|
+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
|
||||||
|
struct UContextReader {
|
||||||
|
- static uintptr_t GetStackPointer(const struct ucontext* uc);
|
||||||
|
+ static uintptr_t GetStackPointer(const ucontext_t* uc);
|
||||||
|
|
||||||
|
- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
|
||||||
|
+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
|
||||||
|
|
||||||
|
- // Juggle a arch-specific ucontext into a minidump format
|
||||||
|
+ // Juggle a arch-specific ucontext_t into a minidump format
|
||||||
|
// out: the minidump structure
|
||||||
|
// info: the collection of register structures.
|
||||||
|
#if defined(__i386__) || defined(__x86_64)
|
||||||
|
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
const struct _libc_fpstate* fp);
|
||||||
|
#elif defined(__aarch64__)
|
||||||
|
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
|
||||||
|
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
const struct fpsimd_context* fpregs);
|
||||||
|
#else
|
||||||
|
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
|
||||||
|
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
index 586d84e..05936d2 100644
|
||||||
|
--- a/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
+++ b/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
|
||||||
|
// Fill in all the holes in the struct to make Valgrind happy.
|
||||||
|
memset(&g_crash_context_, 0, sizeof(g_crash_context_));
|
||||||
|
memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
|
||||||
|
- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
|
||||||
|
+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
|
||||||
|
#if defined(__aarch64__)
|
||||||
|
- struct ucontext* uc_ptr = (struct ucontext*)uc;
|
||||||
|
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
|
struct fpsimd_context* fp_ptr =
|
||||||
|
(struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
|
||||||
|
if (fp_ptr->head.magic == FPSIMD_MAGIC) {
|
||||||
|
@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
|
||||||
|
}
|
||||||
|
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
|
// FP state is not part of user ABI on ARM Linux.
|
||||||
|
- // In case of MIPS Linux FP state is already part of struct ucontext
|
||||||
|
+ // In case of MIPS Linux FP state is already part of ucontext_t
|
||||||
|
// and 'float_state' is not a member of CrashContext.
|
||||||
|
- struct ucontext* uc_ptr = (struct ucontext*)uc;
|
||||||
|
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
|
if (uc_ptr->uc_mcontext.fpregs) {
|
||||||
|
memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
|
||||||
|
sizeof(g_crash_context_.float_state));
|
||||||
|
@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
|
||||||
|
// ExceptionHandler::HandleSignal().
|
||||||
|
siginfo.si_code = SI_USER;
|
||||||
|
siginfo.si_pid = getpid();
|
||||||
|
- struct ucontext context;
|
||||||
|
+ ucontext_t context;
|
||||||
|
getcontext(&context);
|
||||||
|
return HandleSignal(sig, &siginfo, &context);
|
||||||
|
}
|
||||||
|
diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
index daba57e..25598a2 100644
|
||||||
|
--- a/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
+++ b/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
@@ -191,11 +191,11 @@ class ExceptionHandler {
|
||||||
|
struct CrashContext {
|
||||||
|
siginfo_t siginfo;
|
||||||
|
pid_t tid; // the crashing thread.
|
||||||
|
- struct ucontext context;
|
||||||
|
+ ucontext_t context;
|
||||||
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
|
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
|
||||||
|
// In case of MIPS Linux FP state is already part of struct
|
||||||
|
- // ucontext so 'float_state' is not required.
|
||||||
|
+ // ucontext_t so 'float_state' is not required.
|
||||||
|
fpstate_t float_state;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
index 3764eec..80ad5c4 100644
|
||||||
|
--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
+++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
@@ -593,7 +593,7 @@ class MicrodumpWriter {
|
||||||
|
|
||||||
|
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
|
||||||
|
|
||||||
|
- const struct ucontext* const ucontext_;
|
||||||
|
+ const ucontext_t* const ucontext_;
|
||||||
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
|
const google_breakpad::fpstate_t* const float_state_;
|
||||||
|
#endif
|
||||||
|
diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
index d11ba6e..c716143 100644
|
||||||
|
--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
+++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
@@ -1323,7 +1323,7 @@ class MinidumpWriter {
|
||||||
|
const int fd_; // File descriptor where the minidum should be written.
|
||||||
|
const char* path_; // Path to the file where the minidum should be written.
|
||||||
|
|
||||||
|
- const struct ucontext* const ucontext_; // also from the signal handler
|
||||||
|
+ const ucontext_t* const ucontext_; // also from the signal handler
|
||||||
|
#if !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
|
const google_breakpad::fpstate_t* const float_state_; // ditto
|
||||||
|
#endif
|
||||||
@ -0,0 +1,68 @@
|
|||||||
|
--- a/tools/gn/bootstrap/bootstrap.py
|
||||||
|
+++ b/tools/gn/bootstrap/bootstrap.py
|
||||||
|
@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||||||
|
|
||||||
|
write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
|
||||||
|
{
|
||||||
|
+ 'ENABLE_LOCATION_SOURCE': 'false',
|
||||||
|
'ENABLE_PROFILING': 'false',
|
||||||
|
'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
|
||||||
|
})
|
||||||
|
@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||||||
|
|
||||||
|
write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
|
||||||
|
root_gen_dir, options)
|
||||||
|
- cmd = ['ninja', '-C', tempdir]
|
||||||
|
+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
|
||||||
|
if options.verbose:
|
||||||
|
cmd.append('-v')
|
||||||
|
|
||||||
|
@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
'base/metrics/bucket_ranges.cc',
|
||||||
|
'base/metrics/field_trial.cc',
|
||||||
|
'base/metrics/field_trial_param_associator.cc',
|
||||||
|
+ 'base/metrics/field_trial_params.cc',
|
||||||
|
'base/metrics/histogram.cc',
|
||||||
|
'base/metrics/histogram_base.cc',
|
||||||
|
'base/metrics/histogram_functions.cc',
|
||||||
|
@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
'base/task_scheduler/scheduler_lock_impl.cc',
|
||||||
|
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
|
||||||
|
'base/task_scheduler/scheduler_worker.cc',
|
||||||
|
+ 'base/task_scheduler/scheduler_worker_pool.cc',
|
||||||
|
'base/task_scheduler/scheduler_worker_pool_impl.cc',
|
||||||
|
'base/task_scheduler/scheduler_worker_pool_params.cc',
|
||||||
|
'base/task_scheduler/scheduler_worker_stack.cc',
|
||||||
|
@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
'base/third_party/icu/icu_utf.cc',
|
||||||
|
'base/third_party/nspr/prtime.cc',
|
||||||
|
'base/threading/post_task_and_reply_impl.cc',
|
||||||
|
+ 'base/threading/scoped_blocking_call.cc',
|
||||||
|
'base/threading/sequence_local_storage_map.cc',
|
||||||
|
'base/threading/sequenced_task_runner_handle.cc',
|
||||||
|
'base/threading/sequenced_worker_pool.cc',
|
||||||
|
@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
'base/unguessable_token.cc',
|
||||||
|
'base/value_iterators.cc',
|
||||||
|
'base/values.cc',
|
||||||
|
- 'base/value_iterators.cc',
|
||||||
|
'base/vlog.cc',
|
||||||
|
])
|
||||||
|
|
||||||
|
@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
static_libraries['base']['sources'].extend([
|
||||||
|
'base/memory/shared_memory_handle_posix.cc',
|
||||||
|
'base/memory/shared_memory_posix.cc',
|
||||||
|
- 'base/memory/shared_memory_tracker.cc',
|
||||||
|
'base/nix/xdg_util.cc',
|
||||||
|
'base/process/internal_linux.cc',
|
||||||
|
'base/process/memory_linux.cc',
|
||||||
|
@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
|
||||||
|
cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
|
||||||
|
check_call(cmd)
|
||||||
|
|
||||||
|
- cmd = ['ninja', '-C', build_dir]
|
||||||
|
+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
|
||||||
|
if options.verbose:
|
||||||
|
cmd.append('-v')
|
||||||
|
cmd.append('gn')
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
--- a/tools/gn/bootstrap/bootstrap.py
|
||||||
|
+++ b/tools/gn/bootstrap/bootstrap.py
|
||||||
|
@@ -576,7 +576,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||||
|
'base/trace_event/trace_log.cc',
|
||||||
|
'base/trace_event/trace_log_constants.cc',
|
||||||
|
'base/trace_event/tracing_agent.cc',
|
||||||
|
- 'base/tracked_objects.cc',
|
||||||
|
'base/unguessable_token.cc',
|
||||||
|
'base/value_iterators.cc',
|
||||||
|
'base/values.cc',
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
--- a/chrome/installer/BUILD.gn
|
||||||
|
+++ b/chrome/installer/BUILD.gn
|
||||||
|
@@ -3,9 +3,10 @@
|
||||||
|
# found in the LICENSE file.
|
||||||
|
|
||||||
|
import("//build/config/chrome_build.gni")
|
||||||
|
+import("//build/config/sysroot.gni")
|
||||||
|
|
||||||
|
declare_args() {
|
||||||
|
- enable_linux_installer = is_linux && !is_component_build
|
||||||
|
+ enable_linux_installer = is_linux && !is_component_build && use_sysroot
|
||||||
|
}
|
||||||
|
|
||||||
|
# Meta-target that forwards to the installer of the correct type (if any).
|
||||||
Loading…
Reference in New Issue
Block a user