From 7547d0aa874f550fb3d3e8a5365ec51da96cbd86 Mon Sep 17 00:00:00 2001
From: Joshua Peraza <jperaza@chromium.org>
Date: Thu, 13 Aug 2020 11:53:06 -0700
Subject: [PATCH] android: Remove orderfile configs from handler trampoline

Upstreams https://chromium-review.googlesource.com/c/chromium/src/+/1505951

Change-Id: Id78d20308cfcbfba9b0f6535a8c69e9cbbf219e1
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/2354278
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Joshua Peraza <jperaza@chromium.org>
---
 handler/BUILD.gn | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/handler/BUILD.gn b/handler/BUILD.gn
index 4fb72649..dc481784 100644
--- a/handler/BUILD.gn
+++ b/handler/BUILD.gn
@@ -185,6 +185,8 @@ if (crashpad_is_android) {
 
     if (crashpad_is_in_chromium) {
       no_default_deps = true
+      remove_configs =
+          [ "//build/config/android:default_orderfile_instrumentation" ]
     }
   }
 }