Skip to content

Commit

Permalink
Revert "GWP-ASan: Add feature map"
Browse files Browse the repository at this point in the history
This reverts commit 0f1f9dc.

Reason for revert: This change is causing compilation errors in android-builder-perf builds (https://ci.chromium.org/ui/p/chrome/builders/ci/android-builder-perf?limit=100&cursor=id%3E8769985043865326721)

Original change's description:
> GWP-ASan: Add feature map
>
> We intend to expand the GWP-ASan Android experiment to include WebView.
> WebView experiments must add a flag to
> `ProductionSupportedFlagList.java`. To do so, we need to expose the two
> GWP-ASan `base::Feature`s to Java. This CL plumbs together the
> boilerplate to do so.
>
> This change was generated by following
> `android_accessing_cpp_features_in_java.md`.
>
> Bug: b/287426302
> Low-Coverage-Reason: Trivial JNI glue
> Change-Id: Ia5deb8c36c2d52fcdc2acd5ea2837c42bfaaa6ad
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4843470
> Commit-Queue: Kalvin Lee <kdlee@chromium.org>
> Reviewed-by: Benjamin Joyce (Ben) <bjoyce@chromium.org>
> Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
> Reviewed-by: Bo Liu <boliu@chromium.org>
> Reviewed-by: Matthew Denton <mpdenton@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1196407}

Bug: b/287426302 chromium:1482658
Change-Id: If203c21de0ef17f147b73f33c3dfb7ef2199839e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4866672
Reviewed-by: Matthew Denton <mpdenton@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Ashwin Verleker <ashwinpv@google.com>
Reviewed-by: Gregory Guterman <guterman@google.com>
Reviewed-by: Benjamin Joyce (Ben) <bjoyce@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1196711}
  • Loading branch information
Ashwin Verleker authored and Chromium LUCI CQ committed Sep 14, 2023
1 parent d7fa632 commit 6080f92
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 145 deletions.
2 changes: 0 additions & 2 deletions android_webview/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,6 @@ android_library("common_java") {
"//components/autofill/android:autofill_features_java",
"//components/embedder_support/android/metrics:java",
"//components/feature_engagement/public:public_java",
"//components/gwp_asan/client/android:gwp_asan_java",
"//components/metrics:metrics_java",
"//components/network_session_configurator/android:network_session_configurator_java",
"//components/permissions/android:core_java",
Expand All @@ -812,7 +811,6 @@ android_library("common_java") {
"//ui/accessibility:accessibility_features_java",
"//ui/android:ui_android_features_java",
]

srcjar_deps = [
":common_java_features_srcjar",
":common_java_switches_srcjar",
Expand Down
1 change: 0 additions & 1 deletion chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/webid/internal:java",
"//components/autofill/android:payments_autofill_java",
"//components/browser_ui/bottomsheet/android/internal:java",
"//components/gwp_asan/client/android:gwp_asan_java",
"//components/messages/android/internal:java",
"//components/segmentation_platform/internal:internal_java",
]
Expand Down
5 changes: 0 additions & 5 deletions components/gwp_asan/client/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ source_set("features") {
"//base",
]
configs += [ ":gwp_asan_implementation" ]

if (is_android) {
sources += [ "feature_map.cc" ]
deps += [ "android:gwp_asan_headers" ]
}
}

component("client") {
Expand Down
30 changes: 0 additions & 30 deletions components/gwp_asan/client/android/BUILD.gn

This file was deleted.

This file was deleted.

This file was deleted.

38 changes: 0 additions & 38 deletions components/gwp_asan/client/feature_map.cc

This file was deleted.

8 changes: 0 additions & 8 deletions components/memory_system/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@ source_set("memory_system") {
}
}

# Regardless of `enable_gwp_asan`, we must depend directly
# on the presence of the `base::Feature` that governs it. This is
# because WebView depends on it, but support cannot be "compiled out"
# hinging on a buildflag.
if (is_android) {
deps += [ "//components/gwp_asan/client:features" ]
}

if (is_chromeos) {
deps += [ "//build:chromeos_buildflags" ]
}
Expand Down

0 comments on commit 6080f92

Please sign in to comment.