summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/config/android/rules.gni2
-rw-r--r--build/config/compiler/BUILD.gn2
-rw-r--r--build/secondary/testing/gtest/BUILD.gn6
-rw-r--r--build/secondary/third_party/cacheinvalidation/BUILD.gn16
-rw-r--r--build/secondary/third_party/leveldatabase/BUILD.gn4
-rw-r--r--build/secondary/third_party/libsrtp/BUILD.gn10
-rw-r--r--build/secondary/third_party/nss/BUILD.gn16
-rw-r--r--build/secondary/third_party/sfntly/BUILD.gn8
8 files changed, 33 insertions, 31 deletions
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index c33ea11..c7c0f43 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -163,8 +163,8 @@ template("generate_jar_jni") {
depfile = "$target_gen_dir/$target_name.d"
script = "//base/android/jni_generator/jni_generator.py"
sources = [
- jni_generator_include,
jar_file,
+ jni_generator_include,
]
outputs = [
depfile,
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 29385b5..64b91fe 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -720,6 +720,7 @@ config("default_warnings") {
if (is_win) {
cflags = [
"/WX", # Treat warnings as errors.
+
# Warnings permanently disabled:
# TODO(GYP) The GYP build doesn't have this globally enabled but disabled
@@ -774,6 +775,7 @@ config("default_warnings") {
# have to turn off this warning (and be careful about how object
# destruction happens in such cases).
"/wd4611",
+
# Warnings to evaluate and possibly fix/reenable later:
"/wd4100", # Unreferenced formal function parameter.
diff --git a/build/secondary/testing/gtest/BUILD.gn b/build/secondary/testing/gtest/BUILD.gn
index 96f4112..a20a09d 100644
--- a/build/secondary/testing/gtest/BUILD.gn
+++ b/build/secondary/testing/gtest/BUILD.gn
@@ -83,6 +83,9 @@ static_library("gtest") {
"include/gtest/internal/gtest-type-util.h",
#"gtest/src/gtest-all.cc", # Not needed by our build.
+ "../multiprocess_func_list.cc",
+ "../multiprocess_func_list.h",
+ "../platform_test.h",
"src/gtest-death-test.cc",
"src/gtest-filepath.cc",
"src/gtest-internal-inl.h",
@@ -91,9 +94,6 @@ static_library("gtest") {
"src/gtest-test-part.cc",
"src/gtest-typed-test.cc",
"src/gtest.cc",
- "../multiprocess_func_list.cc",
- "../multiprocess_func_list.h",
- "../platform_test.h",
]
if (is_mac) {
diff --git a/build/secondary/third_party/cacheinvalidation/BUILD.gn b/build/secondary/third_party/cacheinvalidation/BUILD.gn
index feb93d74..2e02633 100644
--- a/build/secondary/third_party/cacheinvalidation/BUILD.gn
+++ b/build/secondary/third_party/cacheinvalidation/BUILD.gn
@@ -18,10 +18,10 @@ static_library("cacheinvalidation") {
"overrides/google/cacheinvalidation/deps/googletest.h",
"overrides/google/cacheinvalidation/deps/logging.h",
"overrides/google/cacheinvalidation/deps/mutex.h",
- "overrides/google/cacheinvalidation/deps/random.h",
"overrides/google/cacheinvalidation/deps/random.cc",
- "overrides/google/cacheinvalidation/deps/sha1-digest-function.h",
+ "overrides/google/cacheinvalidation/deps/random.h",
"overrides/google/cacheinvalidation/deps/scoped_ptr.h",
+ "overrides/google/cacheinvalidation/deps/sha1-digest-function.h",
"overrides/google/cacheinvalidation/deps/stl-namespace.h",
"overrides/google/cacheinvalidation/deps/string_util.h",
"overrides/google/cacheinvalidation/deps/time.h",
@@ -49,8 +49,8 @@ static_library("cacheinvalidation") {
"src/google/cacheinvalidation/impl/persistence-utils.h",
"src/google/cacheinvalidation/impl/proto-converter.cc",
"src/google/cacheinvalidation/impl/proto-converter.h",
- "src/google/cacheinvalidation/impl/proto-helpers.h",
"src/google/cacheinvalidation/impl/proto-helpers.cc",
+ "src/google/cacheinvalidation/impl/proto-helpers.h",
"src/google/cacheinvalidation/impl/protocol-handler.cc",
"src/google/cacheinvalidation/impl/protocol-handler.h",
"src/google/cacheinvalidation/impl/recurring-task.cc",
@@ -70,8 +70,8 @@ static_library("cacheinvalidation") {
"src/google/cacheinvalidation/impl/throttle.h",
"src/google/cacheinvalidation/impl/ticl-message-validator.cc",
"src/google/cacheinvalidation/impl/ticl-message-validator.h",
- "src/google/cacheinvalidation/include/invalidation-client.h",
"src/google/cacheinvalidation/include/invalidation-client-factory.h",
+ "src/google/cacheinvalidation/include/invalidation-client.h",
"src/google/cacheinvalidation/include/invalidation-listener.h",
"src/google/cacheinvalidation/include/system-resources.h",
"src/google/cacheinvalidation/include/types.h",
@@ -89,16 +89,16 @@ static_library("cacheinvalidation") {
test("cacheinvalidation_unittests") {
sources = [
+ "src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc",
+ "src/google/cacheinvalidation/impl/protocol-handler_test.cc",
+ "src/google/cacheinvalidation/impl/recurring-task_test.cc",
+ "src/google/cacheinvalidation/impl/throttle_test.cc",
"src/google/cacheinvalidation/test/deterministic-scheduler.cc",
"src/google/cacheinvalidation/test/deterministic-scheduler.h",
"src/google/cacheinvalidation/test/test-logger.cc",
"src/google/cacheinvalidation/test/test-logger.h",
"src/google/cacheinvalidation/test/test-utils.cc",
"src/google/cacheinvalidation/test/test-utils.h",
- "src/google/cacheinvalidation/impl/invalidation-client-impl_test.cc",
- "src/google/cacheinvalidation/impl/protocol-handler_test.cc",
- "src/google/cacheinvalidation/impl/recurring-task_test.cc",
- "src/google/cacheinvalidation/impl/throttle_test.cc",
]
deps = [
diff --git a/build/secondary/third_party/leveldatabase/BUILD.gn b/build/secondary/third_party/leveldatabase/BUILD.gn
index 19eef15..067af30 100644
--- a/build/secondary/third_party/leveldatabase/BUILD.gn
+++ b/build/secondary/third_party/leveldatabase/BUILD.gn
@@ -32,10 +32,10 @@ static_library("leveldatabase") {
"src/db/db_impl.h",
"src/db/db_iter.cc",
"src/db/db_iter.h",
- "src/db/filename.cc",
- "src/db/filename.h",
"src/db/dbformat.cc",
"src/db/dbformat.h",
+ "src/db/filename.cc",
+ "src/db/filename.h",
"src/db/log_format.h",
"src/db/log_reader.cc",
"src/db/log_reader.h",
diff --git a/build/secondary/third_party/libsrtp/BUILD.gn b/build/secondary/third_party/libsrtp/BUILD.gn
index d9b658e..8b9647c 100644
--- a/build/secondary/third_party/libsrtp/BUILD.gn
+++ b/build/secondary/third_party/libsrtp/BUILD.gn
@@ -91,17 +91,17 @@ if (use_system_libsrtp) {
"srtp/include/ut_sim.h",
# headers
- "srtp/crypto/include/aes_cbc.h",
"srtp/crypto/include/aes.h",
+ "srtp/crypto/include/aes_cbc.h",
"srtp/crypto/include/aes_icm.h",
"srtp/crypto/include/alloc.h",
"srtp/crypto/include/auth.h",
"srtp/crypto/include/cipher.h",
- "srtp/crypto/include/cryptoalg.h",
"srtp/crypto/include/crypto.h",
"srtp/crypto/include/crypto_kernel.h",
"srtp/crypto/include/crypto_math.h",
"srtp/crypto/include/crypto_types.h",
+ "srtp/crypto/include/cryptoalg.h",
"srtp/crypto/include/datatypes.h",
"srtp/crypto/include/err.h",
"srtp/crypto/include/gf2_8.h",
@@ -120,8 +120,6 @@ if (use_system_libsrtp) {
"srtp/crypto/include/xfm.h",
# sources
- "srtp/srtp/ekt.c",
- "srtp/srtp/srtp.c",
"srtp/crypto/cipher/aes.c",
"srtp/crypto/cipher/aes_cbc.c",
"srtp/crypto/cipher/aes_icm.c",
@@ -144,6 +142,8 @@ if (use_system_libsrtp) {
"srtp/crypto/rng/ctr_prng.c",
"srtp/crypto/rng/prng.c",
"srtp/crypto/rng/rand_source.c",
+ "srtp/srtp/ekt.c",
+ "srtp/srtp/srtp.c",
]
if (is_clang) {
@@ -214,10 +214,10 @@ if (use_system_libsrtp) {
":libsrtp",
]
sources = [
+ "srtp/crypto/include/datatypes.h",
"srtp/include/getopt_s.h",
"srtp/include/rtp.h",
"srtp/include/srtp.h",
- "srtp/crypto/include/datatypes.h",
"srtp/test/getopt_s.c",
"srtp/test/rtp.c",
"srtp/test/rtpw.c",
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index ee5f112..25d449e 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -61,16 +61,16 @@ if (is_linux) {
"nspr/lib/libc/src/strpbrk.c",
"nspr/lib/libc/src/strstr.c",
"nspr/lib/libc/src/strtok.c",
- "nspr/pr/include/md/prosdep.h",
"nspr/pr/include/md/_darwin.cfg",
"nspr/pr/include/md/_darwin.h",
"nspr/pr/include/md/_pcos.h",
"nspr/pr/include/md/_pth.h",
- "nspr/pr/include/md/_unixos.h",
"nspr/pr/include/md/_unix_errors.h",
+ "nspr/pr/include/md/_unixos.h",
"nspr/pr/include/md/_win32_errors.h",
"nspr/pr/include/md/_win95.cfg",
"nspr/pr/include/md/_win95.h",
+ "nspr/pr/include/md/prosdep.h",
"nspr/pr/include/nspr.h",
"nspr/pr/include/obsolete/pralarm.h",
"nspr/pr/include/obsolete/probslet.h",
@@ -621,6 +621,7 @@ if (is_linux) {
"nss/lib/freebl/ec.h",
"nss/lib/freebl/ecdecode.c",
"nss/lib/freebl/ecl/ec2.h",
+ "nss/lib/freebl/ecl/ec_naf.c",
"nss/lib/freebl/ecl/ecl-curve.h",
"nss/lib/freebl/ecl/ecl-exp.h",
"nss/lib/freebl/ecl/ecl-priv.h",
@@ -638,17 +639,19 @@ if (is_linux) {
"nss/lib/freebl/ecl/ecp_jac.c",
"nss/lib/freebl/ecl/ecp_jm.c",
"nss/lib/freebl/ecl/ecp_mont.c",
- "nss/lib/freebl/ecl/ec_naf.c",
"nss/lib/freebl/gcm.c",
"nss/lib/freebl/gcm.h",
- "nss/lib/freebl/intel-aes-x86-masm.asm",
- "nss/lib/freebl/intel-aes.h",
"nss/lib/freebl/hmacct.c",
"nss/lib/freebl/hmacct.h",
+ "nss/lib/freebl/intel-aes-x86-masm.asm",
+ "nss/lib/freebl/intel-aes.h",
"nss/lib/freebl/jpake.c",
"nss/lib/freebl/md2.c",
"nss/lib/freebl/md5.c",
"nss/lib/freebl/mpi/logtab.h",
+ "nss/lib/freebl/mpi/mp_gf2m-priv.h",
+ "nss/lib/freebl/mpi/mp_gf2m.c",
+ "nss/lib/freebl/mpi/mp_gf2m.h",
"nss/lib/freebl/mpi/mpcpucache.c",
"nss/lib/freebl/mpi/mpi-config.h",
"nss/lib/freebl/mpi/mpi-priv.h",
@@ -663,9 +666,6 @@ if (is_linux) {
"nss/lib/freebl/mpi/mpmontg.c",
"nss/lib/freebl/mpi/mpprime.c",
"nss/lib/freebl/mpi/mpprime.h",
- "nss/lib/freebl/mpi/mp_gf2m-priv.h",
- "nss/lib/freebl/mpi/mp_gf2m.c",
- "nss/lib/freebl/mpi/mp_gf2m.h",
"nss/lib/freebl/mpi/primes.c",
"nss/lib/freebl/nss_build_config_mac.h",
"nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
diff --git a/build/secondary/third_party/sfntly/BUILD.gn b/build/secondary/third_party/sfntly/BUILD.gn
index a4dbd23..111f1cd 100644
--- a/build/secondary/third_party/sfntly/BUILD.gn
+++ b/build/secondary/third_party/sfntly/BUILD.gn
@@ -4,6 +4,10 @@
static_library("sfntly") {
sources = [
+ "cpp/src/sample/chromium/font_subsetter.cc",
+ "cpp/src/sample/chromium/font_subsetter.h",
+ "cpp/src/sample/chromium/subsetter_impl.cc",
+ "cpp/src/sample/chromium/subsetter_impl.h",
"cpp/src/sfntly/data/byte_array.cc",
"cpp/src/sfntly/data/byte_array.h",
"cpp/src/sfntly/data/font_data.cc",
@@ -113,10 +117,6 @@ static_library("sfntly") {
"cpp/src/sfntly/table/truetype/loca_table.h",
"cpp/src/sfntly/tag.cc",
"cpp/src/sfntly/tag.h",
- "cpp/src/sample/chromium/font_subsetter.cc",
- "cpp/src/sample/chromium/font_subsetter.h",
- "cpp/src/sample/chromium/subsetter_impl.cc",
- "cpp/src/sample/chromium/subsetter_impl.h",
]
defines = [ "SFNTLY_NO_EXCEPTION" ]
generated by cgit v1.1 at 2025-01-12 03:58:40 +0000