MSVSphere Packaging Team
2 months ago
parent
e5a7a8e508
commit
532b830644
@ -1,65 +0,0 @@
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
|
||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip 2023-11-06 12:42:34.928657960 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc 2023-11-06 12:51:12.547834851 +0100
|
||||
@@ -28,9 +28,8 @@ limitations under the License.
|
||||
#include "tensorflow_lite_support/cc/port/status_macros.h"
|
||||
#include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h"
|
||||
#include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
|
||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
||||
-#include "third_party/zlib/contrib/minizip/unzip.h"
|
||||
-
|
||||
+#include <minizip/ioapi.h>
|
||||
+#include <minizip/unzip.h>
|
||||
|
||||
namespace tflite {
|
||||
namespace metadata {
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
|
||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc 2023-11-06 12:42:34.928657960 +0100
|
||||
@@ -26,8 +26,8 @@ limitations under the License.
|
||||
#include "tensorflow_lite_support/cc/port/statusor.h"
|
||||
#include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h"
|
||||
#include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
|
||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
||||
-#include "third_party/zlib/contrib/minizip/unzip.h"
|
||||
+#include <minizip/ioapi.h>
|
||||
+#include <minizip/zip.h>
|
||||
|
||||
namespace tflite {
|
||||
namespace metadata {
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
|
||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc 2023-11-06 12:42:34.929657982 +0100
|
||||
@@ -19,7 +19,7 @@ limitations under the License.
|
||||
#include <cstdio>
|
||||
|
||||
#include "absl/strings/string_view.h" // from @com_google_absl
|
||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
||||
+#include <minizip/ioapi.h>
|
||||
|
||||
namespace tflite {
|
||||
namespace metadata {
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
|
||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc 2023-11-06 12:42:34.929657982 +0100
|
||||
@@ -19,7 +19,7 @@ limitations under the License.
|
||||
#include <cstdio>
|
||||
|
||||
#include "absl/strings/string_view.h" // from @com_google_absl
|
||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
||||
+#include <minizip/ioapi.h>
|
||||
|
||||
namespace tflite {
|
||||
namespace metadata {
|
||||
diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
|
||||
--- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip 2023-11-01 19:11:24.000000000 +0100
|
||||
+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h 2023-11-06 12:42:34.929657982 +0100
|
||||
@@ -19,7 +19,7 @@ limitations under the License.
|
||||
#include <cstdlib>
|
||||
|
||||
#include "absl/strings/string_view.h" // from @com_google_absl
|
||||
-#include "third_party/zlib/contrib/minizip/ioapi.h"
|
||||
+#include <minizip/ioapi.h>
|
||||
|
||||
namespace tflite {
|
||||
namespace metadata {
|
||||
@ -1,127 +0,0 @@
|
||||
diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h
|
||||
--- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h.orig 2024-04-12 21:56:54.000000000 +0200
|
||||
+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.h 2024-04-14 20:53:16.043867871 +0200
|
||||
@@ -147,7 +147,13 @@ struct PartitionBucket {
|
||||
// Returns a slot number starting from the beginning of the slot span.
|
||||
PA_ALWAYS_INLINE size_t GetSlotNumber(size_t offset_in_slot_span) const {
|
||||
// See the static assertion for `kReciprocalShift` above.
|
||||
- PA_DCHECK(offset_in_slot_span <= kMaxBucketed);
|
||||
+ // TODO(casey.smalley@arm.com): triggers on Aarch64/Linux
|
||||
+ // systems with 64k system pages. Constants need to be
|
||||
+ // adjusted to prevent different parts of the allocator
|
||||
+ // from overlapping. For now this will allow 64k pages
|
||||
+ // to function on Aarch64/Linux systems, albeit not
|
||||
+ // very efficiently.
|
||||
+ PA_DCHECK(internal::SystemPageSize() == (size_t{1} << 16) || offset_in_slot_span <= kMaxBucketed);
|
||||
PA_DCHECK(slot_size <= kMaxBucketed);
|
||||
|
||||
const size_t offset_in_slot =
|
||||
diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h
|
||||
--- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h.orig 2024-04-14 20:53:16.043867871 +0200
|
||||
+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page_constants.h 2024-04-14 21:39:18.147052845 +0200
|
||||
@@ -17,10 +17,8 @@ namespace partition_alloc::internal {
|
||||
// PartitionPageSize() is 4 times the OS page size.
|
||||
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
|
||||
#elif defined(PARTITION_ALLOCATOR_CONSTANTS_POSIX_NONCONST_PAGE_SIZE)
|
||||
-// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
|
||||
-// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
|
||||
-// so we use the 16 kiB maximum (64 kiB will crash).
|
||||
-static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
|
||||
+// System page size can be 4, 16, or 64 kiB on Linux on AArch64.
|
||||
+static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 16) / kSmallestBucket;
|
||||
#else
|
||||
// A slot span can "span" multiple PartitionPages, but then its slot size is
|
||||
// larger, so it doesn't have as many slots.
|
||||
diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc
|
||||
--- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc.orig 2024-04-14 20:53:16.044867889 +0200
|
||||
+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_root.cc 2024-04-14 21:50:57.926716718 +0200
|
||||
@@ -952,12 +952,11 @@ void PartitionRoot::Init(PartitionOption
|
||||
(internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
// Check runtime pagesize. Though the code is currently the same, it is
|
||||
- // not merged with the IS_APPLE case above as a 1 << 16 case needs to be
|
||||
- // added here in the future, to allow 64 kiB pagesize. That is only
|
||||
- // supported on Linux on arm64, not on IS_APPLE, but not yet present here
|
||||
- // as the rest of the PartitionAlloc does not currently support it.
|
||||
+ // not merged with the IS_APPLE case above as a 1 << 16 case is only
|
||||
+ // supported on Linux on AArch64.
|
||||
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
|
||||
- (internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
+ (internal::SystemPageSize() == (size_t{1} << 14)) ||
|
||||
+ (internal::SystemPageSize() == (size_t{1} << 16)));
|
||||
#endif
|
||||
|
||||
::partition_alloc::internal::ScopedGuard guard{lock_};
|
||||
diff -up chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h
|
||||
--- chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h.me 2024-04-14 22:08:40.655011536 +0200
|
||||
+++ chromium-124.0.6367.49/base/allocator/partition_allocator/src/partition_alloc/partition_page.h 2024-04-14 22:12:46.665731577 +0200
|
||||
@@ -86,27 +86,25 @@ struct SlotSpanMetadata {
|
||||
|
||||
// CHECK()ed in AllocNewSlotSpan().
|
||||
// The maximum number of bits needed to cover all currently supported OSes.
|
||||
- static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
|
||||
+ static constexpr size_t kMaxSlotsPerSlotSpanBits = 15;
|
||||
static_assert(kMaxSlotsPerSlotSpan < (1 << kMaxSlotsPerSlotSpanBits), "");
|
||||
|
||||
- // |marked_full| isn't equivalent to being full. Slot span is marked as full
|
||||
- // iff it isn't on the active slot span list (or any other list).
|
||||
- uint32_t marked_full : 1;
|
||||
// |num_allocated_slots| is 0 for empty or decommitted slot spans, which can
|
||||
// be further differentiated by checking existence of the freelist.
|
||||
- uint32_t num_allocated_slots : kMaxSlotsPerSlotSpanBits;
|
||||
- uint32_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+ uint16_t num_allocated_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+ uint16_t num_unprovisioned_slots : kMaxSlotsPerSlotSpanBits;
|
||||
+
|
||||
+ // |marked_full| isn't equivalent to being full. Slot span is marked as full
|
||||
+ // iff it isn't on the active slot span list (or any other list).
|
||||
+ bool marked_full : 1;
|
||||
|
||||
private:
|
||||
- const uint32_t can_store_raw_size_ : 1;
|
||||
- uint32_t freelist_is_sorted_ : 1;
|
||||
- uint32_t unused1_ : (32 - 1 - 2 * kMaxSlotsPerSlotSpanBits - 1 - 1);
|
||||
+ const uint8_t can_store_raw_size_ : 1;
|
||||
+ uint8_t freelist_is_sorted_ : 1;
|
||||
// If |in_empty_cache_|==1, |empty_cache_index| is undefined and mustn't be
|
||||
// used.
|
||||
- uint16_t in_empty_cache_ : 1;
|
||||
- uint16_t empty_cache_index_
|
||||
- : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans.
|
||||
- uint16_t unused2_ : (16 - 1 - kMaxEmptyCacheIndexBits);
|
||||
+ bool in_empty_cache_ : 1;
|
||||
+ uint8_t empty_cache_index_ : kMaxEmptyCacheIndexBits; // < kMaxFreeableSpans.
|
||||
// Can use only 48 bits (6B) in this bitfield, as this structure is embedded
|
||||
// in PartitionPage which has 2B worth of fields and must fit in 32B.
|
||||
|
||||
@@ -246,18 +244,13 @@ static_assert(sizeof(SlotSpanMetadata) <
|
||||
"SlotSpanMetadata must fit into a Page Metadata slot.");
|
||||
|
||||
inline constexpr SlotSpanMetadata::SlotSpanMetadata() noexcept
|
||||
- : marked_full(0),
|
||||
- num_allocated_slots(0),
|
||||
+ : num_allocated_slots(0),
|
||||
num_unprovisioned_slots(0),
|
||||
+ marked_full(0),
|
||||
can_store_raw_size_(false),
|
||||
freelist_is_sorted_(true),
|
||||
- unused1_(0),
|
||||
in_empty_cache_(0),
|
||||
- empty_cache_index_(0),
|
||||
- unused2_(0) {
|
||||
- (void)unused1_;
|
||||
- (void)unused2_;
|
||||
-}
|
||||
+ empty_cache_index_(0) {}
|
||||
|
||||
inline SlotSpanMetadata::SlotSpanMetadata(const SlotSpanMetadata&) = default;
|
||||
|
||||
@@ -752,7 +745,7 @@ PA_ALWAYS_INLINE void SlotSpanMetadata::
|
||||
|
||||
size_t num_slots_per_span = bucket->get_slots_per_span();
|
||||
PA_DCHECK(num_slots_per_span <= kMaxSlotsPerSlotSpan);
|
||||
- num_unprovisioned_slots = static_cast<uint32_t>(num_slots_per_span);
|
||||
+ num_unprovisioned_slots = static_cast<uint16_t>(num_slots_per_span);
|
||||
PA_DCHECK(num_unprovisioned_slots);
|
||||
|
||||
ToSuperPageExtent()->IncrementNumberOfNonemptySlotSpans();
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc.me chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
|
||||
--- chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc.me 2024-08-06 17:38:26.560468274 +0200
|
||||
+++ chromium-127.0.6533.88/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc 2024-08-06 17:39:00.137139610 +0200
|
||||
@@ -214,6 +214,7 @@ WaylandSurfaceFactory::GetAllowedGLImple
|
||||
impls.emplace_back(gl::ANGLEImplementation::kOpenGL);
|
||||
impls.emplace_back(gl::ANGLEImplementation::kOpenGLES);
|
||||
impls.emplace_back(gl::ANGLEImplementation::kSwiftShader);
|
||||
+ impls.emplace_back(gl::ANGLEImplementation::kVulkan);
|
||||
impls.emplace_back(gl::kGLImplementationEGLGLES2);
|
||||
}
|
||||
return impls;
|
||||
@ -1,38 +0,0 @@
|
||||
commit 89dcd2d419755421290f85e32617acabdd81cac1
|
||||
Author: lauren n. liberda <lauren@selfisekai.rocks>
|
||||
Date: Thu Jun 20 18:55:57 2024 +0000
|
||||
|
||||
unbundle: add missing dav1d targets
|
||||
|
||||
fixes "ERROR Unresolved dependencies.
|
||||
//third_party/crabbyavif:crabbyavif_dav1d_bindings(//build/toolchain/linux/unbundle:default)
|
||||
needs //third_party/dav1d:dav1d_config(//build/toolchain/linux/unbundle:default)
|
||||
//third_party/crabbyavif:crabbyavif_dav1d_bindings(//build/toolchain/linux/unbundle:default)
|
||||
needs //third_party/dav1d:dav1d_headers(//build/toolchain/linux/unbundle:default)"
|
||||
|
||||
Change-Id: I85442e5fb67a804985354570fba453cc619c83d7
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5642761
|
||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1317534}
|
||||
|
||||
diff --git a/build/linux/unbundle/dav1d.gn b/build/linux/unbundle/dav1d.gn
|
||||
index 3d65158bc6144..a6d005a6622e3 100644
|
||||
--- a/build/linux/unbundle/dav1d.gn
|
||||
+++ b/build/linux/unbundle/dav1d.gn
|
||||
@@ -21,3 +21,14 @@ source_set("dav1d") {
|
||||
deps = [ ":dav1d_shim" ]
|
||||
public_configs = [ ":system_dav1d" ]
|
||||
}
|
||||
+
|
||||
+group("dav1d_headers") {
|
||||
+ public_deps = [ ":dav1d_shim" ]
|
||||
+}
|
||||
+
|
||||
+config("dav1d_config") {
|
||||
+ configs = [
|
||||
+ ":system_dav1d",
|
||||
+ ":dav1d_shim_config",
|
||||
+ ]
|
||||
+}
|
||||
@ -1,44 +0,0 @@
|
||||
commit 4ca70656fde83d2db6ed5a8ac9ec9e7443846924
|
||||
Author: Lei Zhang <thestig@chromium.org>
|
||||
Date: Wed Jun 26 16:35:34 2024 +0000
|
||||
|
||||
Move chrome/browser/ui:webui_name_variants to public_deps
|
||||
|
||||
The chrome/browser/ui build target contains webui_contents_wrapper.h,
|
||||
which included the generated webui_name_variants.h header. For this to
|
||||
work correctly, the build system must process the webui_name_variants
|
||||
target first and generate webui_name_variants.h. To do this reliably,
|
||||
without having to depend on webui_name_variants in all targets that
|
||||
transitively include webui_contents_wrapper.h, make it a public_deps.
|
||||
|
||||
Bug: 40253918, 346711540, 346699817, 345645751
|
||||
Change-Id: I6e0b573427cda1b2b408702f139b2c9e83f05045
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5646245
|
||||
Reviewed-by: Anthony Vallée-Dubois <anthonyvd@chromium.org>
|
||||
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1319828}
|
||||
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
index 46648a4c2194e..0883714163a31 100644
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -6436,7 +6436,6 @@ static_library("ui") {
|
||||
}
|
||||
|
||||
deps += [
|
||||
- ":webui_name_variants",
|
||||
"side_search:side_search_tab_data_proto",
|
||||
"//base",
|
||||
"//chrome/browser:main_extra_parts",
|
||||
@@ -6495,7 +6494,10 @@ static_library("ui") {
|
||||
"//ui/lottie",
|
||||
"//ui/views:buildflags",
|
||||
]
|
||||
- public_deps += [ "//ui/base/dragdrop/mojom:mojom_headers" ]
|
||||
+ public_deps += [
|
||||
+ ":webui_name_variants",
|
||||
+ "//ui/base/dragdrop/mojom:mojom_headers",
|
||||
+ ]
|
||||
|
||||
allow_circular_includes_from += [ "//chrome/browser/ui/views" ]
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
commit 50d63ffee3f7f1b1b9303363742ad8ebbfec31fa
|
||||
Author: Lei Zhang <thestig@chromium.org>
|
||||
Date: Wed Jun 26 21:27:51 2024 +0000
|
||||
|
||||
Make more deps entries public_deps in chrome/browser/ui/BUILD.gn
|
||||
|
||||
The chrome/browser/ui build target includes several buildflag headers.
|
||||
For this to work correctly, the build system must be able to generate
|
||||
the buildflag headers first. To do this reliably, without having to
|
||||
depend on buildflag targets in all targets that transitively include the
|
||||
headers that includes buildflag heaers, make these dependencies
|
||||
public_deps.
|
||||
|
||||
For //components/paint_preview/buildflags, remove the deps entry, as it
|
||||
is already in public_deps.
|
||||
|
||||
Bug: 40253918, 346711540, 346699817, 345645751
|
||||
Change-Id: I00e78a430f2e99aa3732406882b352d31e3d7da7
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5647662
|
||||
Commit-Queue: Lei Zhang <thestig@chromium.org>
|
||||
Reviewed-by: Peter Kasting <pkasting@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1320033}
|
||||
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
index bc6a7c03ecd1c..74f92f0431494 100644
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -415,8 +415,10 @@ static_library("ui") {
|
||||
"//chrome/browser/ui/tabs:tab_enums",
|
||||
"//components/cross_device/logging",
|
||||
"//components/dom_distiller/core",
|
||||
+ "//components/enterprise/buildflags",
|
||||
"//components/paint_preview/buildflags",
|
||||
"//components/safe_browsing:buildflags",
|
||||
+ "//components/segmentation_platform/public",
|
||||
"//components/sync",
|
||||
"//components/sync_user_events",
|
||||
"//components/translate/content/browser",
|
||||
@@ -533,7 +535,6 @@ static_library("ui") {
|
||||
"//components/embedder_support:browser_util",
|
||||
"//components/encrypted_messages:encrypted_message_proto",
|
||||
"//components/enterprise",
|
||||
- "//components/enterprise/buildflags:buildflags",
|
||||
"//components/error_page/content/browser",
|
||||
"//components/facilitated_payments/core/features",
|
||||
"//components/favicon/content",
|
||||
@@ -644,7 +645,6 @@ static_library("ui") {
|
||||
"//components/security_interstitials/core:unsafe_resource",
|
||||
"//components/security_state/content",
|
||||
"//components/security_state/core",
|
||||
- "//components/segmentation_platform/public",
|
||||
"//components/send_tab_to_self",
|
||||
"//components/sessions",
|
||||
"//components/sharing_message",
|
||||
@@ -2119,7 +2119,6 @@ static_library("ui") {
|
||||
"//components/omnibox/browser:mojo_bindings",
|
||||
"//components/page_load_metrics/browser",
|
||||
"//components/paint_preview/browser",
|
||||
- "//components/paint_preview/buildflags",
|
||||
"//components/paint_preview/common",
|
||||
"//components/paint_preview/public",
|
||||
"//components/password_manager/content/common",
|
||||
@ -1,37 +0,0 @@
|
||||
commit 2c101186b60ed50f2ba4feaa2e963bd841bcca47
|
||||
Author: Takuto Ikuta <tikuta@chromium.org>
|
||||
Date: Fri Jun 21 06:23:27 2024 +0000
|
||||
|
||||
chrome/browser: add missing dependency
|
||||
|
||||
This is to fix build error due to missing dependency when we update
|
||||
ninja to 1.12.
|
||||
e.g. https://ci.chromium.org/ui/p/chromium/builders/build/linux-build-perf-no-rbe/1690/overview
|
||||
|
||||
Bug: 346711540, 346699817, 345645751, 40253918
|
||||
Change-Id: Ife0a4e09969a4ad2e61dfc1598c9a63ac0b2abd5
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5641516
|
||||
Reviewed-by: Anthony Vallée-Dubois <anthonyvd@chromium.org>
|
||||
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
|
||||
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
|
||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1317790}
|
||||
|
||||
diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
index 96f2c30a6dd22..2957730277a29 100644
|
||||
--- a/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
+++ b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
@@ -201,5 +201,13 @@ source_set("side_panel") {
|
||||
"//ui/gfx:color_utils",
|
||||
"//ui/gfx/geometry:geometry_skia",
|
||||
"//ui/webui",
|
||||
+
|
||||
+ # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751):
|
||||
+ # Use //chrome/browser/ui instead after fixing cyclic dependency.
|
||||
+ "//chrome/browser/ui:webui_name_variants",
|
||||
+ "//components/enterprise/buildflags",
|
||||
+ "//components/paint_preview/buildflags",
|
||||
+ "//components/segmentation_platform/public/proto",
|
||||
+ "//components/webapps/common:mojo_bindings",
|
||||
]
|
||||
}
|
||||
@ -1,49 +0,0 @@
|
||||
commit f2b43c18b8ecfc3ddc49c42c062d796c8b563984
|
||||
Author: Takuto Ikuta <tikuta@chromium.org>
|
||||
Date: Wed Jul 3 09:00:47 2024 +0000
|
||||
|
||||
chrome/browser/ui: add missing dependency
|
||||
|
||||
This is to fix build error due to missing dependency when we update
|
||||
ninja to 1.12.
|
||||
e.g. https://ci.chromium.org/ui/p/chromium/builders/build.shadow/win-build-perf-developer/1/overview
|
||||
|
||||
Bug: 40253918, 345645751, 346694160, 346709958, 346707816
|
||||
Change-Id: I3ede8e345aef5d6d2d8bf5b155601650828bc817
|
||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5644627
|
||||
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
|
||||
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
|
||||
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
|
||||
Reviewed-by: Lei Zhang <thestig@chromium.org>
|
||||
Cr-Commit-Position: refs/heads/main@{#1322655}
|
||||
|
||||
diff --git a/chrome/browser/ui/views/side_panel/BUILD.gn b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
index 2957730277a29..2680a77d855d5 100644
|
||||
--- a/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
+++ b/chrome/browser/ui/views/side_panel/BUILD.gn
|
||||
@@ -202,12 +202,24 @@ source_set("side_panel") {
|
||||
"//ui/gfx/geometry:geometry_skia",
|
||||
"//ui/webui",
|
||||
|
||||
- # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751):
|
||||
+ # TODO(crbug.com/345645751): Use //chrome/browser instead after fixing cyclic dependency.
|
||||
+ "//components/enterprise/common/proto:connectors_proto",
|
||||
+
|
||||
+ # TODO(crbug.com/346711540,crbug.com/346699817,crbug.com/345645751,
|
||||
+ # crbug.com/346694160,crbug.com/346709958,crbug.com/346707816):
|
||||
# Use //chrome/browser/ui instead after fixing cyclic dependency.
|
||||
+ "//chrome/browser/cart:mojo_bindings",
|
||||
+ "//chrome/browser/companion/visual_query",
|
||||
"//chrome/browser/ui:webui_name_variants",
|
||||
+ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings",
|
||||
+ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings",
|
||||
+ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings",
|
||||
"//components/enterprise/buildflags",
|
||||
+ "//components/page_image_service/mojom:mojo_bindings",
|
||||
"//components/paint_preview/buildflags",
|
||||
"//components/segmentation_platform/public/proto",
|
||||
+ "//components/user_education/webui",
|
||||
"//components/webapps/common:mojo_bindings",
|
||||
+ "//ui/webui/resources/cr_components/commerce:mojo_bindings",
|
||||
]
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn
|
||||
--- chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib 2020-04-13 12:25:09.001172601 -0400
|
||||
+++ chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn 2020-04-13 12:25:23.688921586 -0400
|
||||
@@ -294,7 +294,7 @@ if (enable_perfetto_zlib) {
|
||||
public_configs = [ "//buildtools:zlib_config" ]
|
||||
public_deps = [ "//buildtools:zlib" ]
|
||||
} else {
|
||||
- public_configs = [ "//third_party/zlib:zlib_config" ]
|
||||
+ public_configs = [ "//third_party/zlib:system_zlib" ]
|
||||
public_deps = [ "//third_party/zlib" ]
|
||||
}
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
--- chromium-101.0.4951.54/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn.orig 2022-05-15 10:30:50.887333316 +0200
|
||||
+++ chromium-101.0.4951.54/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn 2022-05-15 10:31:43.477318032 +0200
|
||||
@@ -133,7 +133,6 @@ swiftshader_llvm_source_set("swiftshader_llvm") {
|
||||
if (is_ubsan_vptr) {
|
||||
sources = [
|
||||
"llvm/lib/MC/MCWasmObjectTargetWriter.cpp",
|
||||
- "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
|
||||
"llvm/lib/Target/ARM/MCTargetDesc/ARMTargetStreamer.cpp",
|
||||
"llvm/lib/Target/TargetIntrinsicInfo.cpp",
|
||||
]
|
||||
@@ -583,6 +582,7 @@ swiftshader_llvm_source_set("swiftshader_llvm_most") {
|
||||
"llvm/lib/MC/MCAsmInfoCOFF.cpp",
|
||||
"llvm/lib/MC/MCAsmInfoDarwin.cpp",
|
||||
"llvm/lib/MC/MCAsmInfoELF.cpp",
|
||||
+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
|
||||
"llvm/lib/MC/MCAsmMacro.cpp",
|
||||
"llvm/lib/MC/MCAsmStreamer.cpp",
|
||||
"llvm/lib/MC/MCAssembler.cpp",
|
||||
@@ -637,6 +637,7 @@ swiftshader_llvm_source_set("swiftshader_llvm_most") {
|
||||
"llvm/lib/MC/MCWin64EH.cpp",
|
||||
"llvm/lib/MC/MCWinCOFFStreamer.cpp",
|
||||
"llvm/lib/MC/MCWinEH.cpp",
|
||||
+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
|
||||
"llvm/lib/MC/MCXCOFFStreamer.cpp",
|
||||
"llvm/lib/MC/MachObjectWriter.cpp",
|
||||
"llvm/lib/MC/StringTableBuilder.cpp",
|
||||
Loading…
Reference in new issue