summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvchigrin <vchigrin@yandex-team.ru>2014-12-17 01:55:57 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-17 09:56:44 +0000
commit9de91788dea6a23d2d2d326d97bdd12b4d5818c1 (patch)
tree0cd67a56d4150c286de09c1457aff57415ef6395
parent85af06d4acfd1114f92e0d6df73c8da27a57abe0 (diff)
downloadchromium_src-9de91788dea6a23d2d2d326d97bdd12b4d5818c1.zip
chromium_src-9de91788dea6a23d2d2d326d97bdd12b4d5818c1.tar.gz
chromium_src-9de91788dea6a23d2d2d326d97bdd12b4d5818c1.tar.bz2
Fix sandbox target in Windows GN build and enable it.
Re-land of https://codereview.chromium.org/804993003/ . Review URL: https://codereview.chromium.org/808513005 Cr-Commit-Position: refs/heads/master@{#308767}
-rw-r--r--BUILD.gn1
-rw-r--r--sandbox/win/BUILD.gn9
2 files changed, 9 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index bf3f8d9..f4aa4d7 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -340,7 +340,6 @@ group("root") {
"//ppapi:ppapi_c",
"//printing",
"//remoting/client/plugin",
- "//sandbox",
"//storage/browser",
"//sync",
"//third_party/WebKit/public:all_blink",
diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn
index cf30f795..d595903 100644
--- a/sandbox/win/BUILD.gn
+++ b/sandbox/win/BUILD.gn
@@ -65,6 +65,12 @@ source_set("sandbox") {
"src/policy_target.h",
"src/process_mitigations.cc",
"src/process_mitigations.h",
+ "src/process_mitigations_win32k_dispatcher.cc",
+ "src/process_mitigations_win32k_dispatcher.h",
+ "src/process_mitigations_win32k_interception.cc",
+ "src/process_mitigations_win32k_interception.h",
+ "src/process_mitigations_win32k_policy.cc",
+ "src/process_mitigations_win32k_policy.h",
"src/process_thread_dispatcher.cc",
"src/process_thread_dispatcher.h",
"src/process_thread_interception.cc",
@@ -202,6 +208,7 @@ test("sbox_integration_tests") {
deps = [
":sandbox",
+ "//base/test:test_support",
"//testing/gtest",
]
}
@@ -218,6 +225,7 @@ test("sbox_validation_tests") {
deps = [
":sandbox",
+ "//base/test:test_support",
"//testing/gtest",
]
}
@@ -243,6 +251,7 @@ test("sbox_unittests") {
deps = [
":sandbox",
+ "//base/test:test_support",
"//testing/gtest",
]
}