[M54 Merge] NTRegistry - added wow64 redirection support.

chrome_elf/BUILD.gn

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Chrome elf targets (excepting tests) should only link in kernel32.
 # Please don't add dependencies on any other system libraries.
 
 import("//build/config/win/manifest.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 29 matching lines @@
     "chrome_elf_main.cc",
     "chrome_elf_main.h",
   ]
   deps = [
     ":blacklist",
     ":chrome_elf_manifest",
     ":chrome_elf_resources",
     ":chrome_elf_security",
     ":constants",
     ":hook_util",
+    ":nt_registry",
     "//base",
     "//build/config/sanitizers:deps",
     "//chrome/install_static:install_static_util",
-    "//chrome_elf/nt_registry:nt_registry",
     "//components/crash/content/app",
     "//components/crash/core/common",
     "//content/public/common:result_codes",
     "//third_party/crashpad/crashpad/client:client",
   ]
   configs += [ "//build/config/win:windowed" ]
   configs -= [ "//build/config/win:console" ]
   ldflags = [
     "/NODEFAULTLIB:user32.lib",
     "/DELAYLOAD:dbghelp.dll",
@@ skipping 16 matching lines @@
 ## source sets
 ##------------------------------------------------------------------------------
 
 source_set("chrome_elf_security") {
   sources = [
     "chrome_elf_security.cc",
     "chrome_elf_security.h",
   ]
   deps = [
     ":constants",
-    "//chrome_elf/nt_registry:nt_registry",
+    ":nt_registry",
   ]
 }
 
 source_set("constants") {
   sources = [
     "chrome_elf_constants.cc",
     "chrome_elf_constants.h",
   ]
 }
 
@@ skipping 30 matching lines @@
     "blacklist/blacklist_interceptions.h",
     "blacklist/crashpad_helper.cc",
     "blacklist/crashpad_helper.h",
   ]
   public_deps = [
     "//sandbox",
   ]
   deps = [
     ":constants",
     ":hook_util",
+    ":nt_registry",
     "//chrome/install_static:install_static_util",
-    "//chrome_elf/nt_registry:nt_registry",
 
     # Still uses base/win/pe_image.h
     "//base",
     "//third_party/crashpad/crashpad/client:client",
   ]
 }
 
 static_library("hook_util") {
   sources = [
     "hook_util/thunk_getter.cc",
     "hook_util/thunk_getter.h",
   ]
   deps = [
     "//sandbox",
   ]
 }
 
+# This target contains utility functions which must only depend on
+# kernel32. Please don't add dependencies on other system libraries.
+static_library("nt_registry") {
+  sources = [
+    "../sandbox/win/src/nt_internals.h",
+    "nt_registry/nt_registry.cc",
+    "nt_registry/nt_registry.h",
+  ]
+
+  libs = [ "kernel32.lib" ]
+}
+
 ##------------------------------------------------------------------------------
 ## tests
 ##------------------------------------------------------------------------------
 
 test("chrome_elf_unittests") {
   output_name = "chrome_elf_unittests"
   sources = [
     "blacklist/test/blacklist_test.cc",
     "chrome_elf_util_unittest.cc",
     "elf_imports_unittest.cc",
+    "nt_registry/nt_registry_unittest.cc",
     "run_all_unittests.cc",
   ]
   include_dirs = [ "$target_gen_dir" ]
   deps = [
     ":blacklist",
     ":blacklist_test_main_dll",
     ":chrome_elf_security",
     ":constants",
     ":hook_util",
+    ":nt_registry",
     "//base",
     "//base/test:test_support",
     "//chrome",
     "//chrome/common:version_header",
     "//chrome/install_static:install_static_util",
-    "//chrome_elf/nt_registry:nt_registry",
     "//sandbox",
     "//testing/gtest",
   ]
 
   # It's not easily possible to have //chrome in data_deps without changing
   # the //chrome target to bundle up both initial/chrome.exe and chrome.exe.
   # As a workaround, explicitly include a data dep on just chrome.exe, and
   # add //chrome to deps above to make sure it's been built.
   data = [
     "$root_out_dir/chrome.exe",
@@ skipping 18 matching lines @@
   ]
 }
 
 shared_library("blacklist_test_main_dll") {
   sources = [
     "blacklist/test/blacklist_test_main_dll.cc",
     "blacklist/test/blacklist_test_main_dll.def",
   ]
   deps = [
     ":blacklist",
+    ":nt_registry",
     "//base",
     "//build/config/sanitizers:deps",
     "//chrome/install_static:install_static_util",
-    "//chrome_elf/nt_registry:nt_registry",
   ]
   ldflags = [
     "/NODEFAULTLIB:user32.lib",
     "/DELAYLOAD:dbghelp.dll",
     "/DELAYLOAD:ole32.dll",
     "/DELAYLOAD:psapi.dll",
     "/DELAYLOAD:rpcrt4.dll",
     "/DELAYLOAD:shell32.dll",
     "/DELAYLOAD:user32.dll",
     "/DELAYLOAD:winhttp.dll",
@@ skipping 28 matching lines @@
 # which does), Ninja would get confused and always rebuild this target because
 # it sees a declared output file but that file doesn't exist on disk.
 loadable_module("blacklist_test_dll_3") {
   sources = [
     "blacklist/test/blacklist_test_dll_3.cc",
   ]
   deps = [
     "//build/config/sanitizers:deps",
   ]
 }