Roll partition_alloc + cleanup.
Roll partition_alloc and apply some cleanup. I found some targets
referring to removed files.
Diff: https://chromium.googlesource.com/chromium/src/base/allocator/partition_allocator.git/+log/f941becc7efa..2e6b2efb6f43
Bug: 351867706
Change-Id: If9c069460a442d4de66f7ebf3bb8219cda206ef9
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/197694
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/DEPS b/DEPS
index 5a92196..f9017d2 100644
--- a/DEPS
+++ b/DEPS
@@ -442,7 +442,7 @@
# Dependencies for PartitionAlloc.
# Doc: https://docs.google.com/document/d/1wz45t0alQthsIU9P7_rQcfQyqnrBMXzrOjSzdQo-V-A
'third_party/partition_alloc': {
- 'url': '{chromium_git}/chromium/src/base/allocator/partition_allocator.git@f941becc7efa75971aa4e83d0cd3217f4f1ef57f',
+ 'url': '{chromium_git}/chromium/src/base/allocator/partition_allocator.git@2e6b2efb6f435aa3dd400cb3bdcead2a601f8f9a',
'condition': 'dawn_standalone',
},
}
diff --git a/src/dawn/partition_alloc/BUILD.gn b/src/dawn/partition_alloc/BUILD.gn
index fdd2db8..235b02c 100644
--- a/src/dawn/partition_alloc/BUILD.gn
+++ b/src/dawn/partition_alloc/BUILD.gn
@@ -15,24 +15,15 @@
public_deps = [ "${dawn_partition_alloc_dir}:raw_ptr" ]
}
- group("buildflags") {
- public_deps = [ "${dawn_partition_alloc_dir}:buildflags" ]
- }
-
# PartitionAlloc do not fully support MSVC cl.exe compiler. The condition
# is_clang || !is_win is the one used by partition_alloc.
is_clang_or_gcc = is_clang || !is_win
+ assert(is_clang_or_gcc, "PartitionAlloc is not fully supported on MSVC")
- if (is_clang_or_gcc) {
- group("partition_alloc") {
- public_deps = [ "${dawn_partition_alloc_dir}:partition_alloc" ]
- }
+ group("partition_alloc") {
+ public_deps = [ "${dawn_partition_alloc_dir}:partition_alloc" ]
}
} else {
- config("public_includes") {
- include_dirs = [ "." ]
- }
-
source_set("raw_ptr") {
public_configs = [ ":public_includes" ]
public = [
@@ -41,15 +32,7 @@
"partition_alloc/pointers/raw_ref.h",
]
}
-
- source_set("buildflags") {
- public_configs = [ ":public_includes" ]
- public = [ "partition_alloc/partition_alloc_buildflags.h" ]
- }
-
- # The Dawn no-op implementation of PartitionAlloc only contains buildflags
- # to detect the feature is disabled.
- group("partition_alloc") {
- public_deps = [ ":buildflags" ]
+ config("public_includes") {
+ include_dirs = [ "." ]
}
}
diff --git a/src/dawn/tests/BUILD.gn b/src/dawn/tests/BUILD.gn
index 4cbad84..c4bd18c 100644
--- a/src/dawn/tests/BUILD.gn
+++ b/src/dawn/tests/BUILD.gn
@@ -482,16 +482,13 @@
source_set("partition_alloc_support") {
testonly = true
- deps = [
- "${dawn_root}/src/dawn/common",
- "${dawn_root}/src/dawn/partition_alloc",
- ]
-
+ deps = [ "${dawn_root}/src/dawn/common" ]
public = [ "PartitionAllocSupport.h" ]
sources = [ "PartitionAllocSupport.cpp" ]
if (dawn_enable_partition_alloc) {
defines = [ "DAWN_ENABLE_PARTITION_ALLOC" ]
+ deps += [ "${dawn_root}/src/dawn/partition_alloc" ]
}
}
diff --git a/third_party/partition_alloc b/third_party/partition_alloc
index f941bec..2e6b2ef 160000
--- a/third_party/partition_alloc
+++ b/third_party/partition_alloc
@@ -1 +1 @@
-Subproject commit f941becc7efa75971aa4e83d0cd3217f4f1ef57f
+Subproject commit 2e6b2efb6f435aa3dd400cb3bdcead2a601f8f9a