summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-11-02 16:49:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-03 00:50:34 +0000
commitf7698e039267b2d07401506006c0f68bfbfe2453 (patch)
tree08afedf2bf08aad7f998fae777d3bc7c7616ccbf /build
parent744612a3c9be57a263f1ed287af027b774dd1947 (diff)
downloadchromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.zip
chromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.tar.gz
chromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.tar.bz2
gn format everything.
This patch was generated using the following command line: $ git ls-files "*.gn" | grep -v format_test_data | sed -e "s/^/gn format --in-place /" >x.sh $ chmod +x x.sh $ ./x.sh BUG=None R=dpranke@chromium.org,scottmg@chromium.org TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/1415753003 Cr-Commit-Position: refs/heads/master@{#357493}
Diffstat (limited to 'build')
-rw-r--r--build/android/pylib/device/commands/BUILD.gn4
-rw-r--r--build/secondary/third_party/nss/BUILD.gn2
2 files changed, 4 insertions, 2 deletions
diff --git a/build/android/pylib/device/commands/BUILD.gn b/build/android/pylib/device/commands/BUILD.gn
index 363c2f4..c6d4b42 100644
--- a/build/android/pylib/device/commands/BUILD.gn
+++ b/build/android/pylib/device/commands/BUILD.gn
@@ -5,7 +5,9 @@
import("//build/config/android/rules.gni")
group("commands") {
- data_deps = [ ":chromium_commands" ]
+ data_deps = [
+ ":chromium_commands",
+ ]
}
# GYP: //build/android/pylib/device/commands/commands.gyp:chromium_commands
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index 30e5c39..8d152e9 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -1175,8 +1175,8 @@ if (is_linux) {
# Not Windows.
sources -= [
# mpi_x86_asm.c contains MSVC inline assembly code.
- "nss/lib/freebl/mpi/mpi_x86_asm.c",
"nss/lib/freebl/intel-aes-x86-masm.asm",
+ "nss/lib/freebl/mpi/mpi_x86_asm.c",
]
}