[automerger skipped] [DO NOT MERGE] Fix OSX builds for V8 am: 5658a66011 -s ours am: 05251a6458 -s ours am: 70ec779ad7 am: 655032cb7c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v8/+/13799500

Change-Id: Id90137931ba6224330aa4f9fb7c40ccde7d75fa2
diff --git a/Android.base.bp b/Android.base.bp
index 3388444..2d27371 100644
--- a/Android.base.bp
+++ b/Android.base.bp
@@ -656,4 +656,12 @@
         "third_party/zlib",
     ],
     generated_headers: ["v8_generate_bytecode_builtins_list"],
+    sanitize: {
+        cfi: true,
+        blacklist: "./tools/cfi/blacklist.txt",
+    },
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/Android.bp b/Android.bp
index 3cec564..385081b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -99,6 +99,10 @@
     ],
 
     export_include_dirs: ["include"],
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
 
 cc_binary {
@@ -325,4 +329,8 @@
     ],
     host_supported: true,
     local_include_dirs: ["third_party/zlib"],
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/Android.libbase.bp b/Android.libbase.bp
index 63de80e..05c3b09 100644
--- a/Android.libbase.bp
+++ b/Android.libbase.bp
@@ -44,4 +44,8 @@
             cflags: ["-UANDROID"],
         },
     },
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/Android.libplatform.bp b/Android.libplatform.bp
index fd7907e..be7064d 100644
--- a/Android.libplatform.bp
+++ b/Android.libplatform.bp
@@ -21,4 +21,8 @@
         "src",
         "include",
     ],
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/Android.libsampler.bp b/Android.libsampler.bp
index 9ae91e2..568cdbc 100644
--- a/Android.libsampler.bp
+++ b/Android.libsampler.bp
@@ -8,4 +8,8 @@
         "src",
         "include",
     ],
+    apex_available: [
+        "com.android.art.debug",
+        "com.android.art.release",
+    ],
 }
diff --git a/COMMON_OWNERS b/COMMON_OWNERS
deleted file mode 100644
index 74026ea..0000000
--- a/COMMON_OWNERS
+++ /dev/null
@@ -1,44 +0,0 @@
-adamk@chromium.org
-ahaas@chromium.org
-bbudge@chromium.org
-binji@chromium.org
-bikineev@chromium.org
-bmeurer@chromium.org
-cbruni@chromium.org
-clemensb@chromium.org
-danno@chromium.org
-delphick@chromium.org
-dinfuehr@chromium.org
-ecmziegler@chromium.org
-gdeepti@chromium.org
-gsathya@chromium.org
-hablich@chromium.org
-hpayer@chromium.org
-ishell@chromium.org
-jarin@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-leszeks@chromium.org
-machenbach@chromium.org
-mathias@chromium.org
-marja@chromium.org
-mlippautz@chromium.org
-mslekova@chromium.org
-mvstanton@chromium.org
-mythria@chromium.org
-neis@chromium.org
-omerkatz@chromium.org
-petermarshall@chromium.org
-rmcilroy@chromium.org
-sigurds@chromium.org
-solanes@chromium.org
-syg@chromium.org
-szuend@chromium.org
-tebbi@chromium.org
-thibaudm@chromium.org
-ulan@chromium.org
-vahl@chromium.org
-verwaest@chromium.org
-victorgomes@chromium.org
-yangguo@chromium.org
-zhin@chromium.org
diff --git a/ENG_REVIEW_OWNERS b/ENG_REVIEW_OWNERS
deleted file mode 100644
index 6b18930..0000000
--- a/ENG_REVIEW_OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-# Eng reviewers. This is to define an escalation path for potential
-# disagreement among owners. Please consult before adding top-level
-# directories.
-
-adamk@chromium.org
-danno@chromium.org
-hpayer@chromium.org
-rmcilroy@chromium.org
-yangguo@chromium.org
diff --git a/INFRA_OWNERS b/INFRA_OWNERS
deleted file mode 100644
index b5b36aa..0000000
--- a/INFRA_OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-machenbach@chromium.org
-tmrts@chromium.org
-almuthanna@chromium.org
-liviurau@chromium.org
diff --git a/INTL_OWNERS b/INTL_OWNERS
deleted file mode 100644
index 6e9f2ce..0000000
--- a/INTL_OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-cira@chromium.org
-mnita@google.com
-jshin@chromium.org
-ftang@chromium.org
diff --git a/MIPS_OWNERS b/MIPS_OWNERS
deleted file mode 100644
index cab3679..0000000
--- a/MIPS_OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-xwafish@gmail.com
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index 3698d14..0000000
--- a/OWNERS
+++ /dev/null
@@ -1,29 +0,0 @@
-# Eng reviewer. Please reach out before adding new top-level directories.
-# Disagreement among owners should be escalated to eng reviewers.
-file:ENG_REVIEW_OWNERS
-
-per-file .clang-format=file:INFRA_OWNERS
-per-file .clang-tidy=file:INFRA_OWNERS
-per-file .editorconfig=file:INFRA_OWNERS
-per-file .flake8=file:INFRA_OWNERS
-per-file .git-blame-ignore-revs=file:INFRA_OWNERS
-per-file .gitattributes=file:INFRA_OWNERS
-per-file .gitignore=file:INFRA_OWNERS
-per-file .gn=file:INFRA_OWNERS
-per-file .vpython=file:INFRA_OWNERS
-per-file .ycm_extra_conf.py=file:INFRA_OWNERS
-per-file BUILD.gn=file:COMMON_OWNERS
-per-file DEPS=file:INFRA_OWNERS
-# For Test262 rolls.
-per-file DEPS=mathias@chromium.org
-per-file DEPS=syg@chromium.org
-per-file PRESUBMIT.py=file:INFRA_OWNERS
-per-file codereview.settings=file:INFRA_OWNERS
-
-per-file AUTHORS=file:COMMON_OWNERS
-per-file WATCHLIST=file:COMMON_OWNERS
-
-per-file *-mips*=file:MIPS_OWNERS
-per-file *-mips64*=file:MIPS_OWNERS
-per-file *-ppc*=file:PPC_OWNERS
-per-file *-s390*=file:S390_OWNERS
diff --git a/PPC_OWNERS b/PPC_OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/PPC_OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/S390_OWNERS b/S390_OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/S390_OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/build_overrides/OWNERS b/build_overrides/OWNERS
deleted file mode 100644
index cb04fa0..0000000
--- a/build_overrides/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../INFRA_OWNERS
diff --git a/custom_deps/OWNERS b/custom_deps/OWNERS
deleted file mode 100644
index cb04fa0..0000000
--- a/custom_deps/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../INFRA_OWNERS
diff --git a/docs/OWNERS b/docs/OWNERS
deleted file mode 100644
index 39b706f..0000000
--- a/docs/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-hablich@chromium.org
-mathias@chromium.org
diff --git a/genmakefiles.py b/genmakefiles.py
index 0d4aa4d..85f8cfe 100755
--- a/genmakefiles.py
+++ b/genmakefiles.py
@@ -34,6 +34,10 @@
           defaults: ["v8_defaults"],
           srcs: $srcs,
           local_include_dirs: ["src", "include"],
+          apex_available: [
+              "com.android.art.debug",
+              "com.android.art.release",
+          ],
       }
     ''').substitute({'module_name': module_name, 'srcs' : _bpList(sorted(sources))}))
 
@@ -107,6 +111,14 @@
           },
           local_include_dirs: ["src", "include", "third_party/zlib",],
           generated_headers: ["v8_generate_bytecode_builtins_list"],
+          sanitize: {
+              cfi: true,
+              blacklist: "./tools/cfi/blacklist.txt",
+          },
+          apex_available: [
+              "com.android.art.debug",
+              "com.android.art.release",
+          ],
       }
     ''').substitute({'srcs': _bpList(sorted(sources)),
                      'arm_src': _bpList(sorted(arm_src)),
@@ -148,6 +160,10 @@
                   cflags: ["-UANDROID"],
               },
           },
+          apex_available: [
+              "com.android.art.debug",
+              "com.android.art.release",
+          ],
       }
     ''').substitute({'srcs' : _bpList(sorted(sources))}))
 
diff --git a/gni/OWNERS b/gni/OWNERS
deleted file mode 100644
index cb04fa0..0000000
--- a/gni/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../INFRA_OWNERS
diff --git a/include/OWNERS b/include/OWNERS
deleted file mode 100644
index 19c21fb..0000000
--- a/include/OWNERS
+++ /dev/null
@@ -1,23 +0,0 @@
-adamk@chromium.org
-cbruni@chromium.org
-danno@chromium.org
-mlippautz@chromium.org
-ulan@chromium.org
-verwaest@chromium.org
-yangguo@chromium.org
-
-per-file *DEPS=file:../COMMON_OWNERS
-per-file v8-internal.h=file:../COMMON_OWNERS
-per-file v8-inspector.h=dgozman@chromium.org
-per-file v8-inspector.h=pfeldman@chromium.org
-per-file v8-inspector.h=kozyatinskiy@chromium.org
-per-file v8-inspector-protocol.h=dgozman@chromium.org
-per-file v8-inspector-protocol.h=pfeldman@chromium.org
-per-file v8-inspector-protocol.h=kozyatinskiy@chromium.org
-per-file js_protocol.pdl=dgozman@chromium.org
-per-file js_protocol.pdl=pfeldman@chromium.org
-
-# For branch updates:
-per-file v8-version.h=file:../INFRA_OWNERS
-per-file v8-version.h=hablich@chromium.org
-per-file v8-version.h=vahl@chromium.org
diff --git a/include/cppgc/OWNERS b/include/cppgc/OWNERS
deleted file mode 100644
index 6ccabf6..0000000
--- a/include/cppgc/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-bikineev@chromium.org
-omerkatz@chromium.org
\ No newline at end of file
diff --git a/infra/OWNERS b/infra/OWNERS
deleted file mode 100644
index a33a8ba..0000000
--- a/infra/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-file:../INFRA_OWNERS
-
-tandrii@chromium.org
diff --git a/samples/OWNERS b/samples/OWNERS
deleted file mode 100644
index 9c4f243..0000000
--- a/samples/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-mathias@chromium.org
-yangguo@chromium.org
diff --git a/src/OWNERS b/src/OWNERS
deleted file mode 100644
index e5e3de5..0000000
--- a/src/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-per-file *DEPS=file:../COMMON_OWNERS
-per-file intl-*=file:../INTL_OWNERS
-per-file *-intl*=file:../INTL_OWNERS
diff --git a/src/api/OWNERS b/src/api/OWNERS
deleted file mode 100644
index 5195880..0000000
--- a/src/api/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-file:../../include/OWNERS
-clemensb@chromium.org
-ishell@chromium.org
-jkummerow@chromium.org
-leszeks@chromium.org
-mlippautz@chromium.org
-mslekova@chromium.org
-verwaest@chromium.org
diff --git a/src/asmjs/OWNERS b/src/asmjs/OWNERS
deleted file mode 100644
index c400f97..0000000
--- a/src/asmjs/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-ahaas@chromium.org
-clemensb@chromium.org
-titzer@chromium.org
diff --git a/src/ast/OWNERS b/src/ast/OWNERS
deleted file mode 100644
index 1da57bd..0000000
--- a/src/ast/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-adamk@chromium.org
-bmeurer@chromium.org
-gsathya@chromium.org
-leszeks@chromium.org
-littledan@chromium.org
-marja@chromium.org
-neis@chromium.org
-verwaest@chromium.org
diff --git a/src/base/OWNERS b/src/base/OWNERS
deleted file mode 100644
index 8fcbc9e..0000000
--- a/src/base/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-clemensb@chromium.org
-ishell@chromium.org
-mlippautz@chromium.org
diff --git a/src/base/platform/OWNERS b/src/base/platform/OWNERS
deleted file mode 100644
index 782eb7c..0000000
--- a/src/base/platform/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-hpayer@chromium.org
-mlippautz@chromium.org
-ulan@chromium.org
-
-per-file platform-fuchsia.cc=wez@chromium.org
diff --git a/src/builtins/OWNERS b/src/builtins/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/builtins/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/codegen/OWNERS b/src/codegen/OWNERS
deleted file mode 100644
index 332c170..0000000
--- a/src/codegen/OWNERS
+++ /dev/null
@@ -1,19 +0,0 @@
-bbudge@chromium.org
-bmeurer@chromium.org
-clemensb@chromium.org
-delphick@chromium.org
-gdeepti@chromium.org
-ishell@chromium.org
-jarin@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-leszeks@chromium.org
-mslekova@chromium.org
-mvstanton@chromium.org
-neis@chromium.org
-rmcilroy@chromium.org
-sigurds@chromium.org
-solanes@chromium.org
-tebbi@chromium.org
-titzer@chromium.org
-mythria@chromium.org
diff --git a/src/common/OWNERS b/src/common/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/common/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/compiler-dispatcher/OWNERS b/src/compiler-dispatcher/OWNERS
deleted file mode 100644
index 7bc22f1..0000000
--- a/src/compiler-dispatcher/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-ahaas@chromium.org
-jkummerow@chromium.org
-leszeks@chromium.org
-rmcilroy@chromium.org
diff --git a/src/compiler/OWNERS b/src/compiler/OWNERS
deleted file mode 100644
index afc8551..0000000
--- a/src/compiler/OWNERS
+++ /dev/null
@@ -1,23 +0,0 @@
-bmeurer@chromium.org
-danno@chromium.org
-sigurds@chromium.org
-tebbi@chromium.org
-neis@chromium.org
-mvstanton@chromium.org
-mslekova@chromium.org
-jgruber@chromium.org
-nicohartmann@chromium.org
-solanes@chromium.org
-
-per-file wasm-*=ahaas@chromium.org
-per-file wasm-*=bbudge@chromium.org
-per-file wasm-*=binji@chromium.org
-per-file wasm-*=clemensb@chromium.org
-per-file wasm-*=gdeepti@chromium.org
-per-file wasm-*=jkummerow@chromium.org
-
-per-file int64-lowering.*=ahaas@chromium.org
-
-per-file simd-scalar-lowering.*=bbudge@chromium.org
-per-file simd-scalar-lowering.*=gdeepti@chromium.org
-per-file simd-scalar-lowering.*=zhin@chromium.org
diff --git a/src/compiler/backend/OWNERS b/src/compiler/backend/OWNERS
deleted file mode 100644
index d55672b..0000000
--- a/src/compiler/backend/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-bbudge@chromium.org
-gdeepti@chromium.org
-zhin@chromium.org
-
-# Plus src/compiler owners.
-
-per-file register-allocator*=thibaudm@chromium.org
-per-file spill-placer*=thibaudm@chromium.org
diff --git a/src/compiler/backend/ppc/OWNERS b/src/compiler/backend/ppc/OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/src/compiler/backend/ppc/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/src/d8/OWNERS b/src/d8/OWNERS
deleted file mode 100644
index d57b8cb..0000000
--- a/src/d8/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-binji@chromium.org
-bmeurer@chromium.org
-clemensb@chromium.org
-ulan@chromium.org
-verwaest@chromium.org
diff --git a/src/date/OWNERS b/src/date/OWNERS
deleted file mode 100644
index 3e6f2b9..0000000
--- a/src/date/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-ishell@chromium.org
-jshin@chromium.org
-ulan@chromium.org
-verwaest@chromium.org
diff --git a/src/debug/OWNERS b/src/debug/OWNERS
deleted file mode 100644
index 5b93352..0000000
--- a/src/debug/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-bmeurer@chromium.org
-jgruber@chromium.org
-mvstanton@chromium.org
-szuend@chromium.org
-verwaest@chromium.org
-yangguo@chromium.org
diff --git a/src/debug/ppc/OWNERS b/src/debug/ppc/OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/src/debug/ppc/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/src/debug/wasm/gdb-server/OWNERS b/src/debug/wasm/gdb-server/OWNERS
deleted file mode 100644
index e2c94e8..0000000
--- a/src/debug/wasm/gdb-server/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-paolosev@microsoft.com
diff --git a/src/deoptimizer/OWNERS b/src/deoptimizer/OWNERS
deleted file mode 100644
index eae6bba..0000000
--- a/src/deoptimizer/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-jgruber@chromium.org
-neis@chromium.org
-nicohartmann@chromium.org
-sigurds@chromium.org
-tebbi@chromium.org
diff --git a/src/diagnostics/OWNERS b/src/diagnostics/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/diagnostics/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/execution/OWNERS b/src/execution/OWNERS
deleted file mode 100644
index 1e89f1e..0000000
--- a/src/execution/OWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-bmeurer@chromium.org
-ishell@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-mythria@chromium.org
-delphick@chromium.org
-petermarshall@chromium.org
-szuend@chromium.org
-verwaest@chromium.org
-
-per-file futex-emulation.*=marja@chromium.org
diff --git a/src/extensions/OWNERS b/src/extensions/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/extensions/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/flags/OWNERS b/src/flags/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/flags/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/handles/OWNERS b/src/handles/OWNERS
deleted file mode 100644
index 4df0a25..0000000
--- a/src/handles/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-dinfuehr@chromium.org
-ishell@chromium.org
-jkummerow@chromium.org
-mlippautz@chromium.org
-ulan@chromium.org
diff --git a/src/heap/OWNERS b/src/heap/OWNERS
deleted file mode 100644
index 95beec5..0000000
--- a/src/heap/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-bikineev@chromium.org
-dinfuehr@chromium.org
-hpayer@chromium.org
-mlippautz@chromium.org
-omerkatz@chromium.org
-ulan@chromium.org
-
-per-file *factory*=leszeks@chromium.org
-per-file read-only-*=delphick@chromium.org
diff --git a/src/ic/OWNERS b/src/ic/OWNERS
deleted file mode 100644
index 5bf39a2..0000000
--- a/src/ic/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-bmeurer@chromium.org
-ishell@chromium.org
-jkummerow@chromium.org
-mvstanton@chromium.org
-verwaest@chromium.org
-mythria@chromium.org
diff --git a/src/init/OWNERS b/src/init/OWNERS
deleted file mode 100644
index 8e374f7..0000000
--- a/src/init/OWNERS
+++ /dev/null
@@ -1,11 +0,0 @@
-ahaas@chromium.org
-bmeurer@chromium.org
-ftang@chromium.org
-gsathya@chromium.org
-ishell@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-marja@chromium.org
-mathias@chromium.org
-ulan@chromium.org
-verwaest@chromium.org
diff --git a/src/inspector/OWNERS b/src/inspector/OWNERS
deleted file mode 100644
index ea8456b..0000000
--- a/src/inspector/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-alph@chromium.org
-caseq@chromium.org
-dgozman@chromium.org
-kozyatinskiy@chromium.org
-pfeldman@chromium.org
-szuend@chromium.org
-yangguo@chromium.org
-
-per-file PRESUBMIT.py=file:../../INFRA_OWNERS
diff --git a/src/interpreter/OWNERS b/src/interpreter/OWNERS
deleted file mode 100644
index 481caea..0000000
--- a/src/interpreter/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-leszeks@chromium.org
-mythria@chromium.org
-rmcilroy@chromium.org
diff --git a/src/json/OWNERS b/src/json/OWNERS
deleted file mode 100644
index 85599ae..0000000
--- a/src/json/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-ishell@chromium.org
-jkummerow@chromium.org
-verwaest@chromium.org
diff --git a/src/libplatform/OWNERS b/src/libplatform/OWNERS
deleted file mode 100644
index 65e7ba4..0000000
--- a/src/libplatform/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-mlippautz@chromium.org
-ulan@chromium.org
diff --git a/src/libplatform/tracing/OWNERS b/src/libplatform/tracing/OWNERS
deleted file mode 100644
index 507f904..0000000
--- a/src/libplatform/tracing/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-petermarshall@chromium.org
diff --git a/src/libsampler/OWNERS b/src/libsampler/OWNERS
deleted file mode 100644
index 6afd4d0..0000000
--- a/src/libsampler/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-alph@chromium.org
-petermarshall@chromium.org
diff --git a/src/logging/OWNERS b/src/logging/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/logging/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/numbers/OWNERS b/src/numbers/OWNERS
deleted file mode 100644
index c4022e3..0000000
--- a/src/numbers/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-clemensb@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-sigurds@chromium.org
-verwaest@chromium.org
diff --git a/src/objects/OWNERS b/src/objects/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/objects/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/parsing/OWNERS b/src/parsing/OWNERS
deleted file mode 100644
index 9d54af5..0000000
--- a/src/parsing/OWNERS
+++ /dev/null
@@ -1,7 +0,0 @@
-adamk@chromium.org
-gsathya@chromium.org
-leszeks@chromium.org
-littledan@chromium.org
-marja@chromium.org
-neis@chromium.org
-verwaest@chromium.org
diff --git a/src/profiler/OWNERS b/src/profiler/OWNERS
deleted file mode 100644
index 28a7353..0000000
--- a/src/profiler/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-alph@chromium.org
-petermarshall@chromium.org
-
-per-file *heap*=ulan@chromium.org
diff --git a/src/protobuf/OWNERS b/src/protobuf/OWNERS
deleted file mode 100644
index 507f904..0000000
--- a/src/protobuf/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-petermarshall@chromium.org
diff --git a/src/regexp/OWNERS b/src/regexp/OWNERS
deleted file mode 100644
index 3322bb9..0000000
--- a/src/regexp/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-jgruber@chromium.org
-yangguo@chromium.org
diff --git a/src/regexp/ppc/OWNERS b/src/regexp/ppc/OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/src/regexp/ppc/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/src/roots/OWNERS b/src/roots/OWNERS
deleted file mode 100644
index aaffe92..0000000
--- a/src/roots/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-bmeurer@chromium.org
-delphick@chromium.org
-hpayer@chromium.org
-ishell@chromium.org
-jgruber@chromium.org
-jkummerow@chromium.org
-marja@chromium.org
-sigurds@chromium.org
-ulan@chromium.org
diff --git a/src/runtime/OWNERS b/src/runtime/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/runtime/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/sanitizer/OWNERS b/src/sanitizer/OWNERS
deleted file mode 100644
index 29f827d..0000000
--- a/src/sanitizer/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-file:../../INFRA_OWNERS
-
-clemensb@chromium.org
diff --git a/src/snapshot/OWNERS b/src/snapshot/OWNERS
deleted file mode 100644
index 0cf6544..0000000
--- a/src/snapshot/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-delphick@chromium.org
-jgruber@chromium.org
-leszeks@chromium.org
-verwaest@chromium.org
diff --git a/src/strings/OWNERS b/src/strings/OWNERS
deleted file mode 100644
index ac020e2..0000000
--- a/src/strings/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-bmeurer@chromium.org
-jkummerow@chromium.org
-leszeks@chromium.org
-verwaest@chromium.org
diff --git a/src/tasks/OWNERS b/src/tasks/OWNERS
deleted file mode 100644
index 31d383c..0000000
--- a/src/tasks/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-ahaas@chromium.org
-clemensb@chromium.org
-mlippautz@chromium.org
-rmcilroy@chromium.org
-ulan@chromium.org
diff --git a/src/third_party/siphash/OWNERS b/src/third_party/siphash/OWNERS
deleted file mode 100644
index f0ea8b5..0000000
--- a/src/third_party/siphash/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-sigurds@chromium.org
-verwaest@chromium.org
diff --git a/src/third_party/utf8-decoder/OWNERS b/src/third_party/utf8-decoder/OWNERS
deleted file mode 100644
index c008e4c..0000000
--- a/src/third_party/utf8-decoder/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-mathias@chromium.org
-marja@chromium.org
diff --git a/src/third_party/valgrind/OWNERS b/src/third_party/valgrind/OWNERS
deleted file mode 100644
index cb9c7e9..0000000
--- a/src/third_party/valgrind/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../../COMMON_OWNERS
diff --git a/src/third_party/vtune/OWNERS b/src/third_party/vtune/OWNERS
deleted file mode 100644
index cb9c7e9..0000000
--- a/src/third_party/vtune/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../../COMMON_OWNERS
diff --git a/src/torque/OWNERS b/src/torque/OWNERS
deleted file mode 100644
index 03fa4c9..0000000
--- a/src/torque/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-danno@chromium.org
-jarin@chromium.org
-mvstanton@chromium.org
-sigurds@chromium.org
-szuend@chromium.org
-tebbi@chromium.org
diff --git a/src/tracing/OWNERS b/src/tracing/OWNERS
deleted file mode 100644
index 6afd4d0..0000000
--- a/src/tracing/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-alph@chromium.org
-petermarshall@chromium.org
diff --git a/src/trap-handler/OWNERS b/src/trap-handler/OWNERS
deleted file mode 100644
index 7035a46..0000000
--- a/src/trap-handler/OWNERS
+++ /dev/null
@@ -1,8 +0,0 @@
-titzer@chromium.org
-ahaas@chromium.org
-
-# Changes to this directory should also be reviewed by:
-#
-#   ahaas@chromium.org
-#   mseaborn@chromium.org
-#   mark@chromium.org
diff --git a/src/utils/OWNERS b/src/utils/OWNERS
deleted file mode 100644
index 48d72ae..0000000
--- a/src/utils/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../COMMON_OWNERS
diff --git a/src/wasm/OWNERS b/src/wasm/OWNERS
deleted file mode 100644
index 3822418..0000000
--- a/src/wasm/OWNERS
+++ /dev/null
@@ -1,10 +0,0 @@
-ahaas@chromium.org
-bbudge@chromium.org
-binji@chromium.org
-clemensb@chromium.org
-gdeepti@chromium.org
-jkummerow@chromium.org
-thibaudm@chromium.org
-zhin@chromium.org
-
-per-file wasm-js.*=adamk@chromium.org
diff --git a/src/wasm/baseline/ppc/OWNERS b/src/wasm/baseline/ppc/OWNERS
deleted file mode 100644
index 02c2cd7..0000000
--- a/src/wasm/baseline/ppc/OWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-junyan@redhat.com
-joransiu@ca.ibm.com
-midawson@redhat.com
-mfarazma@redhat.com
-vasili.skurydzin@ibm.com
diff --git a/src/zone/OWNERS b/src/zone/OWNERS
deleted file mode 100644
index 04bfcc5..0000000
--- a/src/zone/OWNERS
+++ /dev/null
@@ -1,4 +0,0 @@
-clemensb@chromium.org
-ishell@chromium.org
-sigurds@chromium.org
-verwaest@chromium.org
diff --git a/test/torque/OWNERS b/test/torque/OWNERS
deleted file mode 100644
index 4e832f8..0000000
--- a/test/torque/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../../src/torque/OWNERS
diff --git a/testing/OWNERS b/testing/OWNERS
deleted file mode 100644
index cb04fa0..0000000
--- a/testing/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-file:../INFRA_OWNERS
diff --git a/testing/gmock/OWNERS b/testing/gmock/OWNERS
deleted file mode 100644
index d5fa70c..0000000
--- a/testing/gmock/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-thakis@chromium.org
-pwnall@chromium.org
diff --git a/testing/gtest/OWNERS b/testing/gtest/OWNERS
deleted file mode 100644
index d5fa70c..0000000
--- a/testing/gtest/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-thakis@chromium.org
-pwnall@chromium.org
diff --git a/third_party/zlib/OWNERS b/third_party/zlib/OWNERS
deleted file mode 100644
index 22f4d89..0000000
--- a/third_party/zlib/OWNERS
+++ /dev/null
@@ -1,7 +0,0 @@
-agl@chromium.org
-cavalcantii@chromium.org
-cblume@chromium.org
-mtklein@google.com
-scroggo@google.com
-
-# COMPONENT: Internals
diff --git a/third_party/zlib/contrib/bench/OWNERS b/third_party/zlib/contrib/bench/OWNERS
deleted file mode 100644
index f1e3d4f..0000000
--- a/third_party/zlib/contrib/bench/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-noel@chromium.org
diff --git a/third_party/zlib/contrib/tests/OWNERS b/third_party/zlib/contrib/tests/OWNERS
deleted file mode 100644
index aa6a2d1..0000000
--- a/third_party/zlib/contrib/tests/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-cblume@chromium.org
-cavalcantii@chromium.org
diff --git a/third_party/zlib/contrib/tests/fuzzers/OWNERS b/third_party/zlib/contrib/tests/fuzzers/OWNERS
deleted file mode 100644
index 6397ce6..0000000
--- a/third_party/zlib/contrib/tests/fuzzers/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-cblume@chromium.org
-mmoroz@chromium.org
diff --git a/third_party/zlib/google/OWNERS b/third_party/zlib/google/OWNERS
deleted file mode 100644
index 868af3c..0000000
--- a/third_party/zlib/google/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-satorux@chromium.org
-
-# compression_utils*
-asvitkine@chromium.org
-isherman@chromium.org
-cavalcantii@chromium.org
diff --git a/tools/cfi/blacklist.txt b/tools/cfi/blacklist.txt
new file mode 100644
index 0000000..822f83f
--- /dev/null
+++ b/tools/cfi/blacklist.txt
@@ -0,0 +1,29 @@
+# All std:: types
+# This should be possible to remove, if/when we build against
+# a statically linked libc++.
+type:std::*
+
+# Following entries Taken from chromium's tools/cfi/blacklist.txt
+[cfi-icall]
+
+######### Function pointers cast to incorrect type signatures
+
+# libicu is currently compiled such that in libicu the 'UChar' type is a
+# defined as a char16_t internally, but for the rest of chromium it's an
+# unsigned short, causing mismatched type signatures for icalls to/from icu
+# v8/src/intl.cc
+fun:*LocaleConvertCase*
+
+# PropertyCallbackArguments::Call methods cast function pointers
+src:*src/api-arguments-inl.h
+
+# v8 callback that casts argument template parameters
+fun:*PendingPhantomCallback*Invoke*
+
+# weak_callback_ is cast from original type.
+fun:*GlobalHandles*PostGarbageCollectionProcessing*
+
+fun:*InvokeAccessorGetterCallback*
+
+# check for type failed during indirect function call
+fun:*MemMove*