summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2015-02-27 18:23:09 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-28 02:24:07 +0000
commit7c7296f4dcb7e32fa4440b333a40a37699f517b1 (patch)
tree279df2952a81b93354570bb78e92c3c4c5a24fa9 /sandbox
parente4f56cef9af4457ba0074e963748284d5da35165 (diff)
downloadchromium_src-7c7296f4dcb7e32fa4440b333a40a37699f517b1.zip
chromium_src-7c7296f4dcb7e32fa4440b333a40a37699f517b1.tar.gz
chromium_src-7c7296f4dcb7e32fa4440b333a40a37699f517b1.tar.bz2
Apply gn format with 'sources' sorting to src/
Application of https://codereview.chromium.org/962003002/. TBR=keybuk@chromium.org R=brettw@chromium.org BUG=456014 Review URL: https://codereview.chromium.org/960413003 Cr-Commit-Position: refs/heads/master@{#318574}
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/linux/BUILD.gn4
-rw-r--r--sandbox/mac/BUILD.gn2
-rw-r--r--sandbox/win/BUILD.gn42
3 files changed, 24 insertions, 24 deletions
diff --git a/sandbox/linux/BUILD.gn b/sandbox/linux/BUILD.gn
index c4ce4fc..ccb186a 100644
--- a/sandbox/linux/BUILD.gn
+++ b/sandbox/linux/BUILD.gn
@@ -314,12 +314,12 @@ source_set("libc_urandom_override") {
if (compile_suid_client) {
component("suid_sandbox_client") {
sources = [
- "suid/common/sandbox.h",
- "suid/common/suid_unsafe_environment_variables.h",
"suid/client/setuid_sandbox_client.cc",
"suid/client/setuid_sandbox_client.h",
"suid/client/setuid_sandbox_host.cc",
"suid/client/setuid_sandbox_host.h",
+ "suid/common/sandbox.h",
+ "suid/common/suid_unsafe_environment_variables.h",
]
defines = [ "SANDBOX_IMPLEMENTATION" ]
diff --git a/sandbox/mac/BUILD.gn b/sandbox/mac/BUILD.gn
index e2c39ee..daee138 100644
--- a/sandbox/mac/BUILD.gn
+++ b/sandbox/mac/BUILD.gn
@@ -52,8 +52,8 @@ generate_stubs_output_stem = "xpc_stubs"
action("generate_stubs") {
script = generate_stubs_script
sources = [
- generate_stubs_sig_public,
generate_stubs_sig_private,
+ generate_stubs_sig_public,
]
inputs = [
generate_stubs_header,
diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn
index ac87fa5..93c4343 100644
--- a/sandbox/win/BUILD.gn
+++ b/sandbox/win/BUILD.gn
@@ -87,23 +87,23 @@ source_set("sandbox") {
"src/registry_policy.h",
"src/resolver.cc",
"src/resolver.h",
- "src/restricted_token_utils.cc",
- "src/restricted_token_utils.h",
"src/restricted_token.cc",
"src/restricted_token.h",
+ "src/restricted_token_utils.cc",
+ "src/restricted_token_utils.h",
+ "src/sandbox.cc",
+ "src/sandbox.h",
"src/sandbox_factory.h",
"src/sandbox_globals.cc",
"src/sandbox_nt_types.h",
"src/sandbox_nt_util.cc",
"src/sandbox_nt_util.h",
+ "src/sandbox_policy.h",
"src/sandbox_policy_base.cc",
"src/sandbox_policy_base.h",
- "src/sandbox_policy.h",
"src/sandbox_types.h",
"src/sandbox_utils.cc",
"src/sandbox_utils.h",
- "src/sandbox.cc",
- "src/sandbox.h",
"src/security_level.h",
"src/service_resolver.cc",
"src/service_resolver.h",
@@ -127,37 +127,37 @@ source_set("sandbox") {
"src/target_process.h",
"src/target_services.cc",
"src/target_services.h",
- "src/win_utils.cc",
- "src/win_utils.h",
"src/win2k_threadpool.cc",
"src/win2k_threadpool.h",
+ "src/win_utils.cc",
+ "src/win_utils.h",
"src/window.cc",
"src/window.h",
]
if (current_cpu == "x64") {
sources += [
+ "src/Wow64_64.cc",
"src/interceptors_64.cc",
"src/interceptors_64.h",
"src/resolver_64.cc",
"src/service_resolver_64.cc",
- "src/Wow64_64.cc",
]
} else if (current_cpu == "x86") {
sources += [
+ "src/Wow64.cc",
+ "src/Wow64.h",
"src/resolver_32.cc",
"src/service_resolver_32.cc",
- "src/sidestep_resolver.cc",
- "src/sidestep_resolver.h",
"src/sidestep/ia32_modrm_map.cpp",
"src/sidestep/ia32_opcode_map.cpp",
- "src/sidestep/mini_disassembler_types.h",
"src/sidestep/mini_disassembler.cpp",
"src/sidestep/mini_disassembler.h",
- "src/sidestep/preamble_patcher_with_stub.cpp",
+ "src/sidestep/mini_disassembler_types.h",
"src/sidestep/preamble_patcher.h",
- "src/Wow64.cc",
- "src/Wow64.h",
+ "src/sidestep/preamble_patcher_with_stub.cpp",
+ "src/sidestep_resolver.cc",
+ "src/sidestep_resolver.h",
]
}
@@ -190,10 +190,9 @@ test("sbox_integration_tests") {
"src/address_sanitizer_test.cc",
"src/app_container_test.cc",
"src/file_policy_test.cc",
+ "src/handle_closer_test.cc",
"src/handle_inheritance_test.cc",
"src/handle_policy_test.cc",
- "tests/integration_tests/integration_tests_test.cc",
- "src/handle_closer_test.cc",
"src/integrity_level_test.cc",
"src/ipc_ping_test.cc",
"src/named_pipe_policy_test.cc",
@@ -209,6 +208,7 @@ test("sbox_integration_tests") {
"tests/common/test_utils.cc",
"tests/common/test_utils.h",
"tests/integration_tests/integration_tests.cc",
+ "tests/integration_tests/integration_tests_test.cc",
]
deps = [
@@ -222,10 +222,10 @@ test("sbox_validation_tests") {
sources = [
"tests/common/controller.cc",
"tests/common/controller.h",
- "tests/validation_tests/unit_tests.cc",
"tests/validation_tests/commands.cc",
"tests/validation_tests/commands.h",
"tests/validation_tests/suite.cc",
+ "tests/validation_tests/unit_tests.cc",
]
deps = [
@@ -239,14 +239,14 @@ test("sbox_unittests") {
sources = [
"src/app_container_unittest.cc",
"src/interception_unittest.cc",
- "src/service_resolver_unittest.cc",
- "src/restricted_token_unittest.cc",
+ "src/ipc_unittest.cc",
"src/job_unittest.cc",
- "src/sid_unittest.cc",
"src/policy_engine_unittest.cc",
"src/policy_low_level_unittest.cc",
"src/policy_opcodes_unittest.cc",
- "src/ipc_unittest.cc",
+ "src/restricted_token_unittest.cc",
+ "src/service_resolver_unittest.cc",
+ "src/sid_unittest.cc",
"src/threadpool_unittest.cc",
"src/win_utils_unittest.cc",
"tests/common/test_utils.cc",