diff options
91 files changed, 438 insertions, 427 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 42f5b58..25fc7c0 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -388,18 +388,18 @@ component("base") { "metrics/histogram.h", "metrics/histogram_base.cc", "metrics/histogram_base.h", - "metrics/histogram_delta_serialization.cc", - "metrics/sample_map.cc", - "metrics/sample_map.h", - "metrics/sample_vector.cc", - "metrics/sample_vector.h", "metrics/histogram_delta_serialization.", + "metrics/histogram_delta_serialization.cc", "metrics/histogram_flattener.h", "metrics/histogram_macros.h", "metrics/histogram_samples.cc", "metrics/histogram_samples.h", "metrics/histogram_snapshot_manager.cc", "metrics/histogram_snapshot_manager.h", + "metrics/sample_map.cc", + "metrics/sample_map.h", + "metrics/sample_vector.cc", + "metrics/sample_vector.h", "metrics/sparse_histogram.cc", "metrics/sparse_histogram.h", "metrics/statistics_recorder.cc", @@ -785,9 +785,9 @@ component("base") { "files/file_proxy.cc", "files/file_util.cc", "files/file_util_proxy.cc", + "files/scoped_temp_dir.cc", "path_service.cc", "scoped_native_library.cc", - "files/scoped_temp_dir.cc", ] } diff --git a/base/third_party/nspr/BUILD.gn b/base/third_party/nspr/BUILD.gn index c0b2ec2..a67e168 100644 --- a/base/third_party/nspr/BUILD.gn +++ b/base/third_party/nspr/BUILD.gn @@ -3,9 +3,7 @@ # found in the LICENSE file. source_set("nspr") { - visibility = [ - "//base/*", - ] + visibility = [ "//base/*" ] sources = [ "prtime.cc", diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 66835e2..8103bb1 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -210,10 +210,10 @@ if (current_toolchain == host_toolchain && is_mac) { executable("dump_syms") { sources = [ "src/common/dwarf/bytereader.cc", - "src/common/dwarf_cfi_to_module.cc", - "src/common/dwarf_cu_to_module.cc", "src/common/dwarf/dwarf2diehandler.cc", "src/common/dwarf/dwarf2reader.cc", + "src/common/dwarf_cfi_to_module.cc", + "src/common/dwarf_cu_to_module.cc", "src/common/dwarf_line_to_module.cc", "src/common/language.cc", "src/common/mac/arch_utilities.cc", @@ -339,12 +339,12 @@ if (is_mac) { static_library("breakpad") { sources = [ + "src/client/mac/Framework/Breakpad.mm", + "src/client/mac/Framework/OnDemandServer.mm", "src/client/mac/crash_generation/crash_generation_client.cc", "src/client/mac/crash_generation/crash_generation_client.h", - "src/client/mac/handler/protected_memory_allocator.cc", "src/client/mac/handler/exception_handler.cc", - "src/client/mac/Framework/Breakpad.mm", - "src/client/mac/Framework/OnDemandServer.mm", + "src/client/mac/handler/protected_memory_allocator.cc", ] configs += [ ":internal_config" ] @@ -368,9 +368,9 @@ if (is_mac) { if (is_linux) { executable("symupload") { sources = [ - "src/tools/linux/symupload/sym_upload.cc", "src/common/linux/http_upload.cc", "src/common/linux/http_upload.h", + "src/tools/linux/symupload/sym_upload.cc", ] include_dirs = [ @@ -390,12 +390,12 @@ if (is_linux || is_android) { executable("dump_syms") { sources = [ "src/common/dwarf/bytereader.cc", + "src/common/dwarf/dwarf2diehandler.cc", + "src/common/dwarf/dwarf2reader.cc", "src/common/dwarf_cfi_to_module.cc", "src/common/dwarf_cfi_to_module.h", "src/common/dwarf_cu_to_module.cc", "src/common/dwarf_cu_to_module.h", - "src/common/dwarf/dwarf2diehandler.cc", - "src/common/dwarf/dwarf2reader.cc", "src/common/dwarf_line_to_module.cc", "src/common/dwarf_line_to_module.h", "src/common/language.cc", @@ -410,11 +410,11 @@ if (is_linux || is_android) { "src/common/linux/elfutils.h", "src/common/linux/file_id.cc", "src/common/linux/file_id.h", + "src/common/linux/guid_creator.h", "src/common/linux/linux_libc_support.cc", "src/common/linux/linux_libc_support.h", "src/common/linux/memory_mapped_file.cc", "src/common/linux/memory_mapped_file.h", - "src/common/linux/guid_creator.h", "src/common/module.cc", "src/common/module.h", "src/common/stabs_reader.cc", @@ -689,30 +689,30 @@ if (is_ios) { "src/client/ios/Breakpad.mm", "src/client/ios/BreakpadController.h", "src/client/ios/BreakpadController.mm", - "src/client/ios/handler/ios_exception_minidump_generator.mm", "src/client/ios/handler/ios_exception_minidump_generator.h", + "src/client/ios/handler/ios_exception_minidump_generator.mm", "src/client/mac/crash_generation/ConfigFile.h", "src/client/mac/crash_generation/ConfigFile.mm", "src/client/mac/handler/breakpad_nlist_64.cc", "src/client/mac/handler/breakpad_nlist_64.h", "src/client/mac/handler/dynamic_images.cc", "src/client/mac/handler/dynamic_images.h", - "src/client/mac/handler/protected_memory_allocator.cc", - "src/client/mac/handler/protected_memory_allocator.h", "src/client/mac/handler/exception_handler.cc", "src/client/mac/handler/exception_handler.h", "src/client/mac/handler/minidump_generator.cc", "src/client/mac/handler/minidump_generator.h", + "src/client/mac/handler/protected_memory_allocator.cc", + "src/client/mac/handler/protected_memory_allocator.h", "src/client/mac/sender/uploader.h", "src/client/mac/sender/uploader.mm", + "src/client/minidump_file_writer-inl.h", "src/client/minidump_file_writer.cc", "src/client/minidump_file_writer.h", - "src/client/minidump_file_writer-inl.h", "src/common/convert_UTF.c", "src/common/convert_UTF.h", + "src/common/mac/HTTPMultipartUpload.m", "src/common/mac/file_id.cc", "src/common/mac/file_id.h", - "src/common/mac/HTTPMultipartUpload.m", "src/common/mac/macho_id.cc", "src/common/mac/macho_id.h", "src/common/mac/macho_utilities.cc", @@ -759,14 +759,14 @@ if (is_win) { "src/client/windows/crash_generation/crash_generation_client.h", "src/client/windows/crash_generation/crash_generation_server.cc", "src/client/windows/crash_generation/crash_generation_server.h", + "src/client/windows/crash_generation/minidump_generator.cc", + "src/client/windows/crash_generation/minidump_generator.h", "src/client/windows/handler/exception_handler.cc", "src/client/windows/handler/exception_handler.h", "src/common/windows/guid_string.cc", "src/common/windows/guid_string.h", - "src/google_breakpad/common/minidump_format.h", - "src/client/windows/crash_generation/minidump_generator.cc", - "src/client/windows/crash_generation/minidump_generator.h", "src/common/windows/string_utils-inl.h", + "src/google_breakpad/common/minidump_format.h", ] } 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" ] diff --git a/cc/blink/BUILD.gn b/cc/blink/BUILD.gn index 9d4007b..b9f86c0 100644 --- a/cc/blink/BUILD.gn +++ b/cc/blink/BUILD.gn @@ -9,8 +9,8 @@ component("blink") { output_name = "cc_blink" sources = [ - "context_provider_web_context.h", "cc_blink_export.h", + "context_provider_web_context.h", "scrollbar_impl.cc", "scrollbar_impl.h", "web_animation_curve_common.cc", diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 5b40f4f..8b0e6a3 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -41,6 +41,8 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { if (is_win) { sources += [ "$target_gen_dir/chrome_exe_version.rc", + "//content/app/startup_helper_win.cc", + "//content/public/common/content_switches.cc", "app/chrome_crash_reporter_client.cc", "app/chrome_crash_reporter_client.h", "app/chrome_exe.rc", @@ -55,8 +57,6 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { "app/signature_validator_win.h", "common/crash_keys.cc", "common/crash_keys.h'", - "//content/app/startup_helper_win.cc", - "//content/public/common/content_switches.cc", ] deps += [ ":chrome_version_resources", @@ -408,12 +408,12 @@ if (is_chrome_branded) { copy("default_apps") { visibility = [ ":packed_resources" ] sources = [ + "browser/resources/default_apps/docs.crx", + "browser/resources/default_apps/drive.crx", "browser/resources/default_apps/external_extensions.json", "browser/resources/default_apps/gmail.crx", "browser/resources/default_apps/search.crx", "browser/resources/default_apps/youtube.crx", - "browser/resources/default_apps/drive.crx", - "browser/resources/default_apps/docs.crx", ] outputs = [ "$root_out_dir/default_apps/{{source_file_part}}", @@ -473,12 +473,12 @@ repack("packed_extra_resources") { if (!is_ios && !is_android) { # New paks should be added here by default. sources += [ + "$root_gen_dir/blink/devtools_resources.pak", "$root_gen_dir/chrome/component_extension_resources.pak", "$root_gen_dir/chrome/options_resources.pak", "$root_gen_dir/chrome/quota_internals_resources.pak", "$root_gen_dir/chrome/sync_file_system_internals_resources.pak", "$root_gen_dir/chrome/webrtc_device_provider_resources.pak", - "$root_gen_dir/blink/devtools_resources.pak", ] deps += [ "//chrome/browser/devtools:webrtc_device_provider_resources", @@ -578,10 +578,10 @@ template("chrome_repack_percent") { # All sources should also have deps for completeness. sources = [ - "$root_gen_dir/components/components_resources_${percent}_percent.pak", - "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", "$root_gen_dir/chrome/theme_resources_${percent}_percent.pak", + "$root_gen_dir/components/components_resources_${percent}_percent.pak", + "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", ] deps = [ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 53a6cd4..9f262e3 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -245,7 +245,6 @@ copy_ex("chrome_shell_assets") { clear_dir = true dest = chrome_shell_assets_dir sources = [ - "$root_build_dir/resources.pak", "$root_build_dir/chrome_100_percent.pak", "$root_build_dir/locales/am.pak", "$root_build_dir/locales/ar.pak", @@ -257,8 +256,8 @@ copy_ex("chrome_shell_assets") { "$root_build_dir/locales/el.pak", "$root_build_dir/locales/en-GB.pak", "$root_build_dir/locales/en-US.pak", - "$root_build_dir/locales/es.pak", "$root_build_dir/locales/es-419.pak", + "$root_build_dir/locales/es.pak", "$root_build_dir/locales/fa.pak", "$root_build_dir/locales/fi.pak", "$root_build_dir/locales/fil.pak", @@ -291,6 +290,7 @@ copy_ex("chrome_shell_assets") { "$root_build_dir/locales/vi.pak", "$root_build_dir/locales/zh-CN.pak", "$root_build_dir/locales/zh-TW.pak", + "$root_build_dir/resources.pak", ] deps = [ "//chrome:packed_resources", diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni index 4f42fad..ea9b432 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -24,9 +24,9 @@ template("_repack_one_locale") { # Each input pak file should also have a deps line for completeness. sources = [ - "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak", "${root_gen_dir}/chrome/generated_resources_${locale}.pak", "${root_gen_dir}/chrome/locale_settings_${locale}.pak", + "${root_gen_dir}/chrome/platform_locale_settings_${locale}.pak", "${root_gen_dir}/components/strings/components_strings_${locale}.pak", ] deps = [ @@ -42,8 +42,8 @@ template("_repack_one_locale") { } if (is_chromeos) { sources += [ - "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak", "${root_gen_dir}/remoting/resources/${locale}.pak", + "${root_gen_dir}/ui/chromeos/strings/ui_chromeos_strings_${locale}.pak", ] deps += [ "//remoting/resources", @@ -53,8 +53,8 @@ template("_repack_one_locale") { if (!is_ios) { sources += [ "${root_gen_dir}/content/app/strings/content_strings_${locale}.pak", - "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", "${root_gen_dir}/ui/strings/app_locale_settings_${locale}.pak", + "${root_gen_dir}/ui/strings/ui_strings_${locale}.pak", ] deps += [ "//content/app/strings", diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn index 20829dd..35637e09 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -122,10 +122,10 @@ static_library("renderer") { ] if (!enable_webrtc) { sources -= [ - "media/cast_rtp_stream.cc", - "media/cast_rtp_stream.h", "media/cast_receiver_session.cc", "media/cast_receiver_session.h", + "media/cast_rtp_stream.cc", + "media/cast_rtp_stream.h", ] } } diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index 092ba7a..06cb937 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -14,9 +14,9 @@ process_version("chrome_elf_resources") { shared_library("chrome_elf") { sources = [ + "$target_gen_dir/chrome_elf_version.rc", "chrome_elf_main.cc", "chrome_elf_main.h", - "$target_gen_dir/chrome_elf_version.rc", ] deps = [ ":blacklist", diff --git a/components/audio_modem/BUILD.gn b/components/audio_modem/BUILD.gn index 93c9fd6..5356e61 100644 --- a/components/audio_modem/BUILD.gn +++ b/components/audio_modem/BUILD.gn @@ -4,6 +4,8 @@ static_library("audio_modem") { sources = [ + "audio_modem_switches.cc", + "audio_modem_switches.h", "audio_player.h", "audio_player_impl.cc", "audio_player_impl.h", @@ -13,11 +15,9 @@ static_library("audio_modem") { "constants.cc", "modem_impl.cc", "modem_impl.h", - "public/modem.h", "public/audio_modem_types.h", + "public/modem.h", "public/whispernet_client.h", - "audio_modem_switches.cc", - "audio_modem_switches.h", ] deps = [ diff --git a/components/constrained_window/BUILD.gn b/components/constrained_window/BUILD.gn index 050065a..cbbb36f 100644 --- a/components/constrained_window/BUILD.gn +++ b/components/constrained_window/BUILD.gn @@ -4,9 +4,9 @@ static_library("constrained_window") { sources = [ + "constrained_window/constrained_window_views_client.h", "constrained_window_views.cc", "constrained_window_views.h", - "constrained_window/constrained_window_views_client.h", ] deps = [ diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn index b64c157..8c63c51 100644 --- a/components/nacl/BUILD.gn +++ b/components/nacl/BUILD.gn @@ -10,13 +10,13 @@ if (enable_nacl) { sources = [ "loader/nacl_ipc_adapter.cc", "loader/nacl_ipc_adapter.h", + "loader/nacl_listener.cc", + "loader/nacl_listener.h", "loader/nacl_main.cc", "loader/nacl_main_platform_delegate.h", "loader/nacl_main_platform_delegate_linux.cc", "loader/nacl_main_platform_delegate_mac.mm", "loader/nacl_main_platform_delegate_win.cc", - "loader/nacl_listener.cc", - "loader/nacl_listener.h", "loader/nacl_trusted_listener.cc", "loader/nacl_trusted_listener.h", "loader/nacl_validation_db.h", @@ -95,14 +95,14 @@ if (enable_nacl) { "renderer/file_downloader.h", "renderer/histogram.cc", "renderer/histogram.h", + "renderer/json_manifest.cc", + "renderer/json_manifest.h", "renderer/manifest_downloader.cc", "renderer/manifest_downloader.h", "renderer/manifest_service_channel.cc", "renderer/manifest_service_channel.h", "renderer/nacl_helper.cc", "renderer/nacl_helper.h", - "renderer/json_manifest.cc", - "renderer/json_manifest.h", "renderer/nexe_load_manager.cc", "renderer/nexe_load_manager.h", "renderer/platform_info.cc", @@ -158,6 +158,15 @@ if (enable_nacl) { source_set("nacl_linux") { sources = [ + "//ppapi/nacl_irt/irt_manifest.h", + "//ppapi/nacl_irt/manifest_service.cc", + "//ppapi/nacl_irt/manifest_service.h", + "//ppapi/nacl_irt/plugin_main.cc", + "//ppapi/nacl_irt/plugin_main.h", + "//ppapi/nacl_irt/plugin_startup.cc", + "//ppapi/nacl_irt/plugin_startup.h", + "//ppapi/nacl_irt/ppapi_dispatcher.cc", + "//ppapi/nacl_irt/ppapi_dispatcher.h", "loader/nonsfi/abi_conversion.cc", "loader/nonsfi/abi_conversion.h", "loader/nonsfi/elf_loader.cc", @@ -184,15 +193,6 @@ if (enable_nacl) { "loader/nonsfi/nonsfi_sandbox.h", "loader/sandbox_linux/nacl_bpf_sandbox_linux.cc", "loader/sandbox_linux/nacl_sandbox_linux.cc", - "//ppapi/nacl_irt/irt_manifest.h", - "//ppapi/nacl_irt/manifest_service.cc", - "//ppapi/nacl_irt/manifest_service.h", - "//ppapi/nacl_irt/plugin_main.cc", - "//ppapi/nacl_irt/plugin_main.h", - "//ppapi/nacl_irt/plugin_startup.cc", - "//ppapi/nacl_irt/plugin_startup.h", - "//ppapi/nacl_irt/ppapi_dispatcher.cc", - "//ppapi/nacl_irt/ppapi_dispatcher.h", ] defines = [ "IN_NACL_HELPER=1" ] @@ -235,15 +235,15 @@ source_set("nacl_common") { "common/nacl_cmd_line.h", "common/nacl_constants.cc", "common/nacl_constants.h", - "common/nacl_host_messages.h", "common/nacl_host_messages.cc", + "common/nacl_host_messages.h", "common/nacl_messages.cc", "common/nacl_messages.h", "common/nacl_nonsfi_util.cc", "common/nacl_nonsfi_util.h", "common/nacl_process_type.h", - "common/nacl_renderer_messages.h", "common/nacl_renderer_messages.cc", + "common/nacl_renderer_messages.h", "common/nacl_sandbox_type_mac.h", "common/nacl_types.cc", "common/nacl_types.h", diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn index faedd44..a0c7f91 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn @@ -47,6 +47,7 @@ source_set("browser_sources") { public_deps = [ "//content/public/common:mojo_bindings", + # We expose skia headers in the public API. "//skia", "//third_party/mojo/src/mojo/public/cpp/system", diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn index 42f336a..2bbac9b 100644 --- a/content/shell/BUILD.gn +++ b/content/shell/BUILD.gn @@ -398,9 +398,9 @@ if (use_x11) { copy("copy_x11_fonts") { visibility = [ ":*" ] sources = [ - "renderer/test_runner/resources/fonts/fonts.conf", "//third_party/gardiner_mod/GardinerModBug.ttf", "//third_party/gardiner_mod/GardinerModCat.ttf", + "renderer/test_runner/resources/fonts/fonts.conf", ] outputs = [ "$root_out_dir/{{source_file_part}}", @@ -411,8 +411,8 @@ if (is_android) { copy("copy_android_fonts") { visibility = [ ":*" ] sources = [ - "renderer/test_runner/resources/fonts/android_main_fonts.xml", "renderer/test_runner/resources/fonts/android_fallback_fonts.xml", + "renderer/test_runner/resources/fonts/android_main_fonts.xml", ] outputs = [ "$root_out_dir/{{source_file_part}}", diff --git a/content/shell/android/BUILD.gn b/content/shell/android/BUILD.gn index 9f1a7fa..6d4f89f 100644 --- a/content/shell/android/BUILD.gn +++ b/content/shell/android/BUILD.gn @@ -11,10 +11,10 @@ generate_jni("content_shell_jni_headers") { jni_package = "content/shell" sources = [ "browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java", + "java/src/org/chromium/content_shell/Shell.java", "java/src/org/chromium/content_shell/ShellLayoutTestUtils.java", "java/src/org/chromium/content_shell/ShellManager.java", "java/src/org/chromium/content_shell/ShellMojoTestUtils.java", - "java/src/org/chromium/content_shell/Shell.java", ] } diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 9c4c805..ec6efd3 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -83,10 +83,10 @@ static_library("test_support") { if (enable_webrtc) { sources += [ - "../renderer/media/mock_media_stream_dispatcher.cc", - "../renderer/media/mock_media_stream_dispatcher.h", "../renderer/media/mock_data_channel_impl.cc", "../renderer/media/mock_data_channel_impl.h", + "../renderer/media/mock_media_stream_dispatcher.cc", + "../renderer/media/mock_media_stream_dispatcher.h", "../renderer/media/mock_peer_connection_impl.cc", "../renderer/media/mock_peer_connection_impl.h", "../renderer/media/mock_web_rtc_peer_connection_handler_client.cc", diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn index af81012b..ce89c42 100644 --- a/courgette/BUILD.gn +++ b/courgette/BUILD.gn @@ -7,14 +7,10 @@ import("//testing/test.gni") static_library("courgette_lib") { sources = [ "adjustment_method.cc", - "adjustment_method_2.cc", "adjustment_method.h", + "adjustment_method_2.cc", "assembly_program.cc", "assembly_program.h", - "third_party/bsdiff.h", - "third_party/bsdiff_apply.cc", - "third_party/bsdiff_create.cc", - "third_party/paged_array.h", "courgette.h", "crc.cc", "crc.h", @@ -28,10 +24,10 @@ static_library("courgette_lib") { "disassembler_elf_32_arm.h", "disassembler_elf_32_x86.cc", "disassembler_elf_32_x86.h", - "disassembler_win32_x86.cc", - "disassembler_win32_x86.h", "disassembler_win32_x64.cc", "disassembler_win32_x64.h", + "disassembler_win32_x86.cc", + "disassembler_win32_x86.h", "encoded_program.cc", "encoded_program.h", "ensemble.cc", @@ -40,15 +36,19 @@ static_library("courgette_lib") { "ensemble_create.cc", "memory_allocator.cc", "memory_allocator.h", + "patch_generator_x86_32.h", + "patcher_x86_32.h", "region.h", "simple_delta.cc", "simple_delta.h", "streams.cc", "streams.h", + "third_party/bsdiff.h", + "third_party/bsdiff_apply.cc", + "third_party/bsdiff_create.cc", + "third_party/paged_array.h", "types_elf.h", "types_win_pe.h", - "patch_generator_x86_32.h", - "patcher_x86_32.h", ] deps = [ @@ -91,20 +91,20 @@ executable("courgette_minimal_tool") { test("courgette_unittests") { sources = [ "adjustment_method_unittest.cc", - "bsdiff_memory_unittest.cc", "base_test_unittest.cc", "base_test_unittest.h", + "bsdiff_memory_unittest.cc", "difference_estimator_unittest.cc", "disassembler_elf_32_x86_unittest.cc", - "disassembler_win32_x86_unittest.cc", "disassembler_win32_x64_unittest.cc", - "encoded_program_unittest.cc", + "disassembler_win32_x86_unittest.cc", "encode_decode_unittest.cc", + "encoded_program_unittest.cc", "ensemble_unittest.cc", "streams_unittest.cc", + "third_party/paged_array_unittest.cc", "typedrva_unittest.cc", "versioning_unittest.cc", - "third_party/paged_array_unittest.cc", ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index 6f99a8e..9f944e5 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -16,8 +16,8 @@ component("crypto") { "crypto_export.h", "cssm_init.cc", "cssm_init.h", - "curve25519.cc", "curve25519-donna.c", + "curve25519.cc", "curve25519.h", "ec_private_key.h", "ec_private_key_nss.cc", @@ -67,8 +67,8 @@ component("crypto") { "rsa_private_key_openssl.cc", "scoped_capi_types.h", "scoped_nss_types.h", - "secure_hash_default.cc", "secure_hash.h", + "secure_hash_default.cc", "secure_hash_openssl.cc", "secure_util.cc", "secure_util.h", @@ -219,11 +219,11 @@ if (!is_win) { "hmac_unittest.cc", "nss_util_unittest.cc", "openssl_bio_string_unittest.cc", - "p224_unittest.cc", "p224_spake_unittest.cc", + "p224_unittest.cc", "random_unittest.cc", - "rsa_private_key_unittest.cc", "rsa_private_key_nss_unittest.cc", + "rsa_private_key_unittest.cc", "secure_hash_unittest.cc", "sha2_unittest.cc", "signature_creator_unittest.cc", @@ -256,10 +256,10 @@ if (!is_win) { source_set("test_support") { sources = [ - "scoped_test_nss_db.cc", - "scoped_test_nss_db.h", "scoped_test_nss_chromeos_user.cc", "scoped_test_nss_chromeos_user.h", + "scoped_test_nss_db.cc", + "scoped_test_nss_db.h", "scoped_test_system_nss_key_slot.cc", "scoped_test_system_nss_key_slot.h", ] diff --git a/device/bluetooth/BUILD.gn b/device/bluetooth/BUILD.gn index f66af9a..a8ea64b 100644 --- a/device/bluetooth/BUILD.gn +++ b/device/bluetooth/BUILD.gn @@ -35,8 +35,8 @@ component("bluetooth") { "bluetooth_audio_sink.h", "bluetooth_audio_sink_chromeos.cc", "bluetooth_audio_sink_chromeos.h", - "bluetooth_channel_mac.mm", "bluetooth_channel_mac.h", + "bluetooth_channel_mac.mm", "bluetooth_device.cc", "bluetooth_device.h", "bluetooth_device_chromeos.cc", @@ -45,8 +45,8 @@ component("bluetooth") { "bluetooth_device_mac.mm", "bluetooth_device_win.cc", "bluetooth_device_win.h", - "bluetooth_discovery_manager_mac.mm", "bluetooth_discovery_manager_mac.h", + "bluetooth_discovery_manager_mac.mm", "bluetooth_discovery_session.cc", "bluetooth_discovery_session.h", "bluetooth_gatt_characteristic.cc", @@ -65,8 +65,8 @@ component("bluetooth") { "bluetooth_gatt_service.h", "bluetooth_init_win.cc", "bluetooth_init_win.h", - "bluetooth_l2cap_channel_mac.mm", "bluetooth_l2cap_channel_mac.h", + "bluetooth_l2cap_channel_mac.mm", "bluetooth_low_energy_defs_win.cc", "bluetooth_low_energy_defs_win.h", "bluetooth_low_energy_device_mac.h", @@ -83,8 +83,8 @@ component("bluetooth") { "bluetooth_remote_gatt_descriptor_chromeos.h", "bluetooth_remote_gatt_service_chromeos.cc", "bluetooth_remote_gatt_service_chromeos.h", - "bluetooth_rfcomm_channel_mac.mm", "bluetooth_rfcomm_channel_mac.h", + "bluetooth_rfcomm_channel_mac.mm", "bluetooth_service_record_win.cc", "bluetooth_service_record_win.h", "bluetooth_socket.cc", diff --git a/device/core/BUILD.gn b/device/core/BUILD.gn index b77bda8..2f25eef 100644 --- a/device/core/BUILD.gn +++ b/device/core/BUILD.gn @@ -10,5 +10,7 @@ source_set("core") { "device_monitor_win.h", ] - deps = [ "//base" ] + deps = [ + "//base", + ] } diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn index a97aeba..5a5d449 100644 --- a/device/usb/BUILD.gn +++ b/device/usb/BUILD.gn @@ -13,14 +13,14 @@ source_set("usb") { "usb_context.h", "usb_descriptors.cc", "usb_descriptors.h", - "usb_device_impl.cc", - "usb_device_impl.h", "usb_device.h", "usb_device_filter.cc", "usb_device_filter.h", + "usb_device_handle.h", "usb_device_handle_impl.cc", "usb_device_handle_impl.h", - "usb_device_handle.h", + "usb_device_impl.cc", + "usb_device_impl.h", "usb_error.cc", "usb_error.h", "usb_ids.cc", diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 5280a42..ae914e3 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -70,6 +70,7 @@ source_set("test_support") { sources = rebase_path(extensions_gypi_values.extensions_test_support_sources, ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] @@ -97,6 +98,7 @@ source_set("test_support") { # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak repack("shell_and_test_pak") { sources = [ + "$root_gen_dir/blink/devtools_resources.pak", "$root_gen_dir/blink/public/resources/blink_resources.pak", "$root_gen_dir/content/app/strings/content_strings_en-US.pak", "$root_gen_dir/content/content_resources.pak", @@ -109,7 +111,6 @@ repack("shell_and_test_pak") { "$root_gen_dir/ui/resources/ui_resources_100_percent.pak", "$root_gen_dir/ui/strings/app_locale_settings_en-US.pak", "$root_gen_dir/ui/strings/ui_strings_en-US.pak", - "$root_gen_dir/blink/devtools_resources.pak", ] output = "$root_out_dir/extensions_shell_and_test.pak" diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn index 3cd8117..1718727 100644 --- a/extensions/common/BUILD.gn +++ b/extensions/common/BUILD.gn @@ -13,6 +13,7 @@ source_set("common_constants") { rebase_path(extensions_gypi_values.extensions_common_constants_sources, ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } @@ -29,6 +30,7 @@ if (enable_extensions) { sources = rebase_path(extensions_gypi_values.extensions_common_sources, ".", "//extensions") + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] diff --git a/gin/BUILD.gn b/gin/BUILD.gn index 8f7e360..5446d56 100644 --- a/gin/BUILD.gn +++ b/gin/BUILD.gn @@ -48,10 +48,10 @@ component("gin") { "public/isolate_holder.h", "public/v8_platform.h", "public/wrapper_info.h", - "runner.cc", - "runner.h", "run_microtasks_observer.cc", "run_microtasks_observer.h", + "runner.cc", + "runner.h", "shell_runner.cc", "shell_runner.h", "try_catch.cc", @@ -151,8 +151,8 @@ test("gin_unittests") { "modules/module_registry_unittest.cc", "modules/timer_unittest.cc", "per_context_data_unittest.cc", - "shell_runner_unittest.cc", "shell/gin_shell_unittest.cc", + "shell_runner_unittest.cc", "test/run_all_unittests.cc", "test/run_js_tests.cc", "wrappable_unittest.cc", diff --git a/ipc/BUILD.gn b/ipc/BUILD.gn index 439d461..b756921 100644 --- a/ipc/BUILD.gn +++ b/ipc/BUILD.gn @@ -8,9 +8,9 @@ component("ipc") { sources = [ "ipc_channel.cc", "ipc_channel.h", + "ipc_channel_common.cc", "ipc_channel_factory.cc", "ipc_channel_factory.h", - "ipc_channel_common.cc", "ipc_channel_handle.h", "ipc_channel_nacl.cc", "ipc_channel_nacl.h", diff --git a/ipc/mojo/BUILD.gn b/ipc/mojo/BUILD.gn index 97d3be8..39855c4 100644 --- a/ipc/mojo/BUILD.gn +++ b/ipc/mojo/BUILD.gn @@ -13,21 +13,21 @@ mojom("client_channel") { component("mojo") { sources = [ - "client_channel.mojom", "async_handle_waiter.cc", "async_handle_waiter.h", + "client_channel.mojom", "ipc_channel_mojo.cc", "ipc_channel_mojo.h", "ipc_channel_mojo_host.cc", "ipc_channel_mojo_host.h", + "ipc_message_pipe_reader.cc", + "ipc_message_pipe_reader.h", "ipc_mojo_bootstrap.cc", "ipc_mojo_bootstrap.h", "ipc_mojo_handle_attachment.cc", "ipc_mojo_handle_attachment.h", "ipc_mojo_message_helper.cc", "ipc_mojo_message_helper.h", - "ipc_message_pipe_reader.cc", - "ipc_message_pipe_reader.h", ] defines = [ "IPC_MOJO_IMPLEMENTATION" ] diff --git a/jingle/BUILD.gn b/jingle/BUILD.gn index d99f384..65ffd1c 100644 --- a/jingle/BUILD.gn +++ b/jingle/BUILD.gn @@ -35,8 +35,8 @@ if (enable_webrtc || !is_android) { "notifier/base/gaia_constants.h", "notifier/base/gaia_token_pre_xmpp_auth.cc", "notifier/base/gaia_token_pre_xmpp_auth.h", - "notifier/base/notification_method.h", "notifier/base/notification_method.cc", + "notifier/base/notification_method.h", "notifier/base/notifier_options.cc", "notifier/base/notifier_options.h", "notifier/base/notifier_options_util.cc", @@ -61,10 +61,10 @@ if (enable_webrtc || !is_android) { "notifier/listener/notification_constants.h", "notifier/listener/notification_defines.cc", "notifier/listener/notification_defines.h", - "notifier/listener/push_client_observer.cc", - "notifier/listener/push_client_observer.h", "notifier/listener/push_client.cc", "notifier/listener/push_client.h", + "notifier/listener/push_client_observer.cc", + "notifier/listener/push_client_observer.h", "notifier/listener/push_notifications_listen_task.cc", "notifier/listener/push_notifications_listen_task.h", "notifier/listener/push_notifications_send_update_task.cc", @@ -182,8 +182,8 @@ if (enable_webrtc || !is_android) { sources = [ "notifier/base/gaia_constants.cc", "notifier/base/gaia_constants.h", - "notifier/base/notification_method.h", "notifier/base/notification_method.cc", + "notifier/base/notification_method.h", "notifier/base/notifier_options.cc", "notifier/base/notifier_options.h", ] diff --git a/media/cdm/ppapi/BUILD.gn b/media/cdm/ppapi/BUILD.gn index 5bcca69..5b8339b 100644 --- a/media/cdm/ppapi/BUILD.gn +++ b/media/cdm/ppapi/BUILD.gn @@ -54,8 +54,8 @@ clearkeycdmadapter_rc_file = "$target_gen_dir/clearkeycdmadapter_version.rc" process_version("clearkeycdmadapter_resources") { visibility = [ ":*" ] sources = [ - "external_clear_key/BRANDING", "//media/clearkeycdmadapter.ver", + "external_clear_key/BRANDING", ] output = clearkeycdmadapter_rc_file } diff --git a/mojo/android/BUILD.gn b/mojo/android/BUILD.gn index 25f3bfa..c21dc3f 100644 --- a/mojo/android/BUILD.gn +++ b/mojo/android/BUILD.gn @@ -103,9 +103,9 @@ shared_library("mojo_java_unittests") { testonly = true sources = [ + "javatests/init_library.cc", "javatests/mojo_test_case.cc", "javatests/mojo_test_case.h", - "javatests/init_library.cc", "javatests/validation_test_util.cc", "javatests/validation_test_util.h", ] diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn index 24df858..bedd651 100644 --- a/mojo/environment/BUILD.gn +++ b/mojo/environment/BUILD.gn @@ -12,8 +12,8 @@ source_set("chromium") { # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) "//third_party/mojo/src/mojo/public/cpp/environment/async_waiter.h", "//third_party/mojo/src/mojo/public/cpp/environment/lib/async_waiter.cc", - "//third_party/mojo/src/mojo/public/cpp/environment/logging.h", "//third_party/mojo/src/mojo/public/cpp/environment/lib/logging.cc", + "//third_party/mojo/src/mojo/public/cpp/environment/logging.h", ] public_deps = [ diff --git a/mojo/nacl/BUILD.gn b/mojo/nacl/BUILD.gn index 8399df4..d090455 100644 --- a/mojo/nacl/BUILD.gn +++ b/mojo/nacl/BUILD.gn @@ -46,8 +46,8 @@ if (!is_nacl) { # A library for launching a NaCl sandbox connected to a Mojo embedder. static_library("monacl_sel") { sources = [ - "mojo_syscall_internal.h", "$gen_dir/mojo_syscall.cc", + "mojo_syscall_internal.h", "monacl_sel_main.cc", ] diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn index d591133e3..4a8d409 100644 --- a/mojo/services/html_viewer/BUILD.gn +++ b/mojo/services/html_viewer/BUILD.gn @@ -48,6 +48,8 @@ source_set("lib") { "webclipboard_impl.h", "webcookiejar_impl.cc", "webcookiejar_impl.h", + "weblayertreeview_impl.cc", + "weblayertreeview_impl.h", "webmediaplayer_factory.cc", "webmediaplayer_factory.h", "webmimeregistry_impl.cc", @@ -64,8 +66,6 @@ source_set("lib") { "webthread_impl.h", "weburlloader_impl.cc", "weburlloader_impl.h", - "weblayertreeview_impl.cc", - "weblayertreeview_impl.h", ] include_dirs = [ "third_party/WebKit" ] diff --git a/net/BUILD.gn b/net/BUILD.gn index bfacab9..fd27722 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -942,6 +942,7 @@ if (!is_ios && !is_android) { deps = [ ":net", # TODO(brettw) bug 363749: this shouldn't be necessary. It's not # in the GYP build, and can be removed when the bug is fixed. + ":test_support", "//base", "//base/test:test_support", diff --git a/pdf/BUILD.gn b/pdf/BUILD.gn index 0f74323..584bbbf 100644 --- a/pdf/BUILD.gn +++ b/pdf/BUILD.gn @@ -6,14 +6,14 @@ pdf_engine = 0 # 0 PDFium static_library("pdf") { sources = [ - "button.h", "button.cc", - "chunk_stream.h", + "button.h", "chunk_stream.cc", - "control.h", + "chunk_stream.h", "control.cc", - "document_loader.h", + "control.h", "document_loader.cc", + "document_loader.h", "draw_utils.cc", "draw_utils.h", "fading_control.cc", @@ -34,11 +34,11 @@ static_library("pdf") { "paint_manager.h", "pdf.cc", "pdf.h", - "progress_control.cc", - "progress_control.h", "pdf_engine.h", "preview_mode_client.cc", "preview_mode_client.h", + "progress_control.cc", + "progress_control.h", "resource.h", "resource_consts.h", "thumbnail_control.cc", diff --git a/ppapi/native_client/src/untrusted/irt_stub/BUILD.gn b/ppapi/native_client/src/untrusted/irt_stub/BUILD.gn index 443f080..63819ac 100644 --- a/ppapi/native_client/src/untrusted/irt_stub/BUILD.gn +++ b/ppapi/native_client/src/untrusted/irt_stub/BUILD.gn @@ -7,9 +7,9 @@ assert(is_nacl, source_set("ppapi_stub_lib") { sources = [ + "plugin_main_irt.c", "ppapi_plugin_main.c", "ppapi_plugin_start.c", - "plugin_main_irt.c", "thread_creator.c", ] } diff --git a/printing/BUILD.gn b/printing/BUILD.gn index ed4c9d0..d035801 100644 --- a/printing/BUILD.gn +++ b/printing/BUILD.gn @@ -95,8 +95,8 @@ component("printing") { sources -= [ "printed_document_mac.cc" ] } else { sources += [ - "printing_context_mac.mm", "printing_context_mac.h", + "printing_context_mac.mm", ] } } @@ -106,9 +106,9 @@ component("printing") { # print backend and enables a custom implementation instead. defines += [ "PRINT_BACKEND_AVAILABLE" ] sources += [ + "backend/print_backend_win.cc", "backend/win_helper.cc", "backend/win_helper.h", - "backend/print_backend_win.cc", "printing_context_system_dialog_win.cc", "printing_context_system_dialog_win.h", "printing_context_win.cc", diff --git a/rlz/BUILD.gn b/rlz/BUILD.gn index 9c44dad..bc02810 100644 --- a/rlz/BUILD.gn +++ b/rlz/BUILD.gn @@ -21,11 +21,12 @@ source_set("rlz_lib") { "lib/assert.h", "lib/crc32.h", "lib/crc32_wrapper.cc", - "lib/crc8.h", "lib/crc8.cc", + "lib/crc8.h", "lib/financial_ping.cc", "lib/financial_ping.h", "lib/lib_values.cc", + "lib/lib_values.h", "lib/machine_id.cc", "lib/machine_id.h", "lib/recursive_cross_process_lock_posix.cc", @@ -34,13 +35,12 @@ source_set("rlz_lib") { "lib/rlz_lib.cc", "lib/rlz_lib.h", "lib/rlz_lib_clear.cc", - "lib/lib_values.h", "lib/rlz_value_store.h", "lib/string_utils.cc", "lib/string_utils.h", "mac/lib/machine_id_mac.cc", - "mac/lib/rlz_value_store_mac.mm", "mac/lib/rlz_value_store_mac.h", + "mac/lib/rlz_value_store_mac.mm", "win/lib/lib_mutex.cc", "win/lib/lib_mutex.h", "win/lib/machine_deal.cc", @@ -72,8 +72,8 @@ source_set("rlz_lib") { # These _mac files are also used on iOS. set_sources_assignment_filter([]) sources += [ - "mac/lib/rlz_value_store_mac.mm", "mac/lib/rlz_value_store_mac.h", + "mac/lib/rlz_value_store_mac.mm", ] set_sources_assignment_filter(sources_assignment_filter) } 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", diff --git a/sdch/BUILD.gn b/sdch/BUILD.gn index 70c778a..3ceeeb4 100644 --- a/sdch/BUILD.gn +++ b/sdch/BUILD.gn @@ -27,17 +27,17 @@ static_library("sdch") { "open-vcdiff/src/headerparser.h", "open-vcdiff/src/instruction_map.cc", "open-vcdiff/src/instruction_map.h", - "open-vcdiff/src/jsonwriter.h", "open-vcdiff/src/jsonwriter.cc", + "open-vcdiff/src/jsonwriter.h", "open-vcdiff/src/rolling_hash.h", "open-vcdiff/src/testing.h", "open-vcdiff/src/varint_bigendian.cc", "open-vcdiff/src/varint_bigendian.h", "open-vcdiff/src/vcdecoder.cc", - "open-vcdiff/src/vcencoder.cc", "open-vcdiff/src/vcdiff_defs.h", "open-vcdiff/src/vcdiffengine.cc", "open-vcdiff/src/vcdiffengine.h", + "open-vcdiff/src/vcencoder.cc", "open-vcdiff/vsprojects/config.h", "open-vcdiff/vsprojects/stdint.h", ] diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 69940ae..8c843c9 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -255,6 +255,7 @@ config("skia_library_config") { "/wd4554", # 'operator' : check operator precedence for possible error "/wd4748", # compiler will disable optimizations if a function has inline # assembly code contains flow control(jmp or jcc) statements. + "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). ] } @@ -264,6 +265,9 @@ component("skia") { sources = [ # Chrome sources. "config/SkUserConfig.h", + "ext/SkDiscardableMemory_chrome.cc", + "ext/SkDiscardableMemory_chrome.h", + "ext/SkMemory_new_handler.cpp", "ext/analysis_canvas.cc", "ext/analysis_canvas.h", "ext/benchmarking_canvas.cc", @@ -292,15 +296,12 @@ component("skia") { "ext/recursive_gaussian_convolution.cc", "ext/recursive_gaussian_convolution.h", "ext/refptr.h", - "ext/SkDiscardableMemory_chrome.h", - "ext/SkDiscardableMemory_chrome.cc", - "ext/SkMemory_new_handler.cpp", "ext/skia_utils_base.cc", "ext/skia_utils_base.h", - "ext/skia_utils_ios.mm", "ext/skia_utils_ios.h", - "ext/skia_utils_mac.mm", + "ext/skia_utils_ios.mm", "ext/skia_utils_mac.h", + "ext/skia_utils_mac.mm", "ext/skia_utils_win.cc", "ext/skia_utils_win.h", ] @@ -330,7 +331,6 @@ component("skia") { # Remove unused util files include in utils.gypi sources -= [ "//third_party/skia/include/utils/SkBoundaryPatch.h", - "//third_party/skia/include/utils/SkFrontBufferedStream.h", "//third_party/skia/include/utils/SkCamera.h", "//third_party/skia/include/utils/SkCanvasStateUtils.h", "//third_party/skia/include/utils/SkCubicInterval.h", @@ -338,6 +338,7 @@ component("skia") { "//third_party/skia/include/utils/SkDebugUtils.h", "//third_party/skia/include/utils/SkDumpCanvas.h", "//third_party/skia/include/utils/SkEventTracer.h", + "//third_party/skia/include/utils/SkFrontBufferedStream.h", "//third_party/skia/include/utils/SkInterpolator.h", "//third_party/skia/include/utils/SkLayer.h", "//third_party/skia/include/utils/SkMeshUtils.h", @@ -349,13 +350,13 @@ component("skia") { "//third_party/skia/src/utils/SkBitmapHasher.cpp", "//third_party/skia/src/utils/SkBitmapHasher.h", "//third_party/skia/src/utils/SkBoundaryPatch.cpp", - "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", "//third_party/skia/src/utils/SkCamera.cpp", "//third_party/skia/src/utils/SkCanvasStack.h", "//third_party/skia/src/utils/SkCubicInterval.cpp", "//third_party/skia/src/utils/SkCullPoints.cpp", "//third_party/skia/src/utils/SkDumpCanvas.cpp", "//third_party/skia/src/utils/SkFloatUtils.h", + "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", "//third_party/skia/src/utils/SkInterpolator.cpp", "//third_party/skia/src/utils/SkLayer.cpp", "//third_party/skia/src/utils/SkMD5.cpp", @@ -373,8 +374,8 @@ component("skia") { "//third_party/skia/src/utils/SkTLogic.h", # We don't currently need to change thread affinity, so leave out this complexity for now. - "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", "//third_party/skia/src/utils/SkThreadUtils_pthread_linux.cpp", + "//third_party/skia/src/utils/SkThreadUtils_pthread_mach.cpp", #testing "//third_party/skia/src/fonts/SkGScalerContext.cpp", @@ -417,8 +418,8 @@ component("skia") { if (is_win) { sources -= [ "//third_party/skia/src/ports/SkOSFile_posix.cpp", - "//third_party/skia/src/ports/SkTime_Unix.cpp", "//third_party/skia/src/ports/SkTLS_pthread.cpp", + "//third_party/skia/src/ports/SkTime_Unix.cpp", ] } else { sources -= [ @@ -445,16 +446,16 @@ component("skia") { if (!is_linux) { sources -= [ - "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", + "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", ] } if (!is_linux && !is_android) { sources -= [ - "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", + "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", ] } diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn index d7f14e3..60cac60 100644 --- a/storage/browser/BUILD.gn +++ b/storage/browser/BUILD.gn @@ -6,7 +6,6 @@ component("browser") { output_name = "storage_browser" sources = [ - "storage_browser_export.h", "blob/blob_data_builder.cc", "blob/blob_data_builder.h", "blob/blob_data_handle.cc", @@ -167,6 +166,7 @@ component("browser") { "quota/storage_observer.h", "quota/usage_tracker.cc", "quota/usage_tracker.h", + "storage_browser_export.h", ] defines = [ "STORAGE_BROWSER_IMPLEMENTATION" ] diff --git a/storage/common/BUILD.gn b/storage/common/BUILD.gn index 2c55bb9..97ddb2f 100644 --- a/storage/common/BUILD.gn +++ b/storage/common/BUILD.gn @@ -8,7 +8,6 @@ component("common") { sources = [ "data_element.cc", "data_element.h", - "storage_common_export.h", "database/database_connections.cc", "database/database_connections.h", "database/database_identifier.cc", @@ -24,6 +23,7 @@ component("common") { "quota/quota_status_code.cc", "quota/quota_status_code.h", "quota/quota_types.h", + "storage_common_export.h", ] # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. diff --git a/sync/protocol/BUILD.gn b/sync/protocol/BUILD.gn index ba9b602..b8258f90 100644 --- a/sync/protocol/BUILD.gn +++ b/sync/protocol/BUILD.gn @@ -6,10 +6,10 @@ import("//third_party/protobuf/proto_library.gni") proto_library("protocol") { sources = [ + "app_list_specifics.proto", "app_notification_specifics.proto", "app_setting_specifics.proto", "app_specifics.proto", - "app_list_specifics.proto", "article_specifics.proto", "attachments.proto", "autofill_specifics.proto", @@ -27,11 +27,11 @@ proto_library("protocol") { "favicon_tracking_specifics.proto", "get_updates_caller_info.proto", "history_delete_directive_specifics.proto", - "nigori_specifics.proto", "managed_user_setting_specifics.proto", "managed_user_shared_setting_specifics.proto", "managed_user_specifics.proto", "managed_user_whitelist_specifics.proto", + "nigori_specifics.proto", "password_specifics.proto", "preference_specifics.proto", "priority_preference_specifics.proto", diff --git a/third_party/android_protobuf/BUILD.gn b/third_party/android_protobuf/BUILD.gn index 252bc8d..7863b079 100644 --- a/third_party/android_protobuf/BUILD.gn +++ b/third_party/android_protobuf/BUILD.gn @@ -13,32 +13,8 @@ if (current_toolchain == host_toolchain) { ] sources = [ - "src/src/google/protobuf/descriptor.cc", - "src/src/google/protobuf/descriptor.pb.cc", - "src/src/google/protobuf/descriptor_database.cc", - "src/src/google/protobuf/dynamic_message.cc", - "src/src/google/protobuf/extension_set.cc", - "src/src/google/protobuf/extension_set_heavy.cc", - "src/src/google/protobuf/generated_message_reflection.cc", - "src/src/google/protobuf/generated_message_util.cc", - "src/src/google/protobuf/message.cc", - "src/src/google/protobuf/message_lite.cc", - "src/src/google/protobuf/reflection_ops.cc", - "src/src/google/protobuf/repeated_field.cc", - "src/src/google/protobuf/service.cc", - "src/src/google/protobuf/text_format.cc", - "src/src/google/protobuf/unknown_field_set.cc", - "src/src/google/protobuf/wire_format.cc", - "src/src/google/protobuf/wire_format_lite.cc", "src/src/google/protobuf/compiler/code_generator.cc", "src/src/google/protobuf/compiler/command_line_interface.cc", - "src/src/google/protobuf/compiler/importer.cc", - "src/src/google/protobuf/compiler/main.cc", - "src/src/google/protobuf/compiler/parser.cc", - "src/src/google/protobuf/compiler/plugin.cc", - "src/src/google/protobuf/compiler/plugin.pb.cc", - "src/src/google/protobuf/compiler/subprocess.cc", - "src/src/google/protobuf/compiler/zip_writer.cc", "src/src/google/protobuf/compiler/cpp/cpp_enum.cc", "src/src/google/protobuf/compiler/cpp/cpp_enum_field.cc", "src/src/google/protobuf/compiler/cpp/cpp_extension.cc", @@ -51,6 +27,7 @@ if (current_toolchain == host_toolchain) { "src/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc", "src/src/google/protobuf/compiler/cpp/cpp_service.cc", "src/src/google/protobuf/compiler/cpp/cpp_string_field.cc", + "src/src/google/protobuf/compiler/importer.cc", "src/src/google/protobuf/compiler/java/java_enum.cc", "src/src/google/protobuf/compiler/java/java_enum_field.cc", "src/src/google/protobuf/compiler/java/java_extension.cc", @@ -81,7 +58,21 @@ if (current_toolchain == host_toolchain) { "src/src/google/protobuf/compiler/javanano/javanano_message.cc", "src/src/google/protobuf/compiler/javanano/javanano_message_field.cc", "src/src/google/protobuf/compiler/javanano/javanano_primitive_field.cc", + "src/src/google/protobuf/compiler/main.cc", + "src/src/google/protobuf/compiler/parser.cc", + "src/src/google/protobuf/compiler/plugin.cc", + "src/src/google/protobuf/compiler/plugin.pb.cc", "src/src/google/protobuf/compiler/python/python_generator.cc", + "src/src/google/protobuf/compiler/subprocess.cc", + "src/src/google/protobuf/compiler/zip_writer.cc", + "src/src/google/protobuf/descriptor.cc", + "src/src/google/protobuf/descriptor.pb.cc", + "src/src/google/protobuf/descriptor_database.cc", + "src/src/google/protobuf/dynamic_message.cc", + "src/src/google/protobuf/extension_set.cc", + "src/src/google/protobuf/extension_set_heavy.cc", + "src/src/google/protobuf/generated_message_reflection.cc", + "src/src/google/protobuf/generated_message_util.cc", "src/src/google/protobuf/io/coded_stream.cc", "src/src/google/protobuf/io/gzip_stream.cc", "src/src/google/protobuf/io/printer.cc", @@ -89,12 +80,21 @@ if (current_toolchain == host_toolchain) { "src/src/google/protobuf/io/zero_copy_stream.cc", "src/src/google/protobuf/io/zero_copy_stream_impl.cc", "src/src/google/protobuf/io/zero_copy_stream_impl_lite.cc", + "src/src/google/protobuf/message.cc", + "src/src/google/protobuf/message_lite.cc", + "src/src/google/protobuf/reflection_ops.cc", + "src/src/google/protobuf/repeated_field.cc", + "src/src/google/protobuf/service.cc", "src/src/google/protobuf/stubs/common.cc", "src/src/google/protobuf/stubs/hash.cc", "src/src/google/protobuf/stubs/once.cc", "src/src/google/protobuf/stubs/structurally_valid.cc", "src/src/google/protobuf/stubs/strutil.cc", "src/src/google/protobuf/stubs/substitute.cc", + "src/src/google/protobuf/text_format.cc", + "src/src/google/protobuf/unknown_field_set.cc", + "src/src/google/protobuf/wire_format.cc", + "src/src/google/protobuf/wire_format_lite.cc", ] include_dirs = [ diff --git a/third_party/ashmem/BUILD.gn b/third_party/ashmem/BUILD.gn index a3f7e6a..5e92b37 100644 --- a/third_party/ashmem/BUILD.gn +++ b/third_party/ashmem/BUILD.gn @@ -6,7 +6,7 @@ assert(is_android) source_set("ashmem") { sources = [ - "ashmem.h", "ashmem-dev.c", + "ashmem.h", ] } diff --git a/third_party/cld/BUILD.gn b/third_party/cld/BUILD.gn index 7a0c0eb..0917f25 100644 --- a/third_party/cld/BUILD.gn +++ b/third_party/cld/BUILD.gn @@ -16,6 +16,24 @@ source_set("cld") { check_includes = false sources = [ + "base/basictypes.h", + "base/build_config.h", + "base/casts.h", + "base/commandlineflags.h", + "base/crash.h", + "base/dynamic_annotations.h", + "base/global_strip_options.h", + "base/log_severity.h", + "base/logging.h", + "base/macros.h", + "base/port.h", + "base/scoped_ptr.h", + "base/stl_decl_msvc.h", + "base/string_util.h", + "base/strtoint.h", + "base/template_util.h", + "base/type_traits.h", + "base/vlog_is_on.h", "encodings/compact_lang_det/cldutil.cc", "encodings/compact_lang_det/cldutil.h", "encodings/compact_lang_det/cldutil_dbg.h", @@ -26,6 +44,12 @@ source_set("cld") { "encodings/compact_lang_det/compact_lang_det_impl.h", "encodings/compact_lang_det/ext_lang_enc.cc", "encodings/compact_lang_det/ext_lang_enc.h", + "encodings/compact_lang_det/generated/cld_generated_score_quadchrome_0406.cc", + "encodings/compact_lang_det/generated/compact_lang_det_generated_cjkbis_0.cc", + "encodings/compact_lang_det/generated/compact_lang_det_generated_ctjkvz.cc", + "encodings/compact_lang_det/generated/compact_lang_det_generated_deltaoctachrome.cc", + "encodings/compact_lang_det/generated/compact_lang_det_generated_meanscore.h", + "encodings/compact_lang_det/generated/compact_lang_det_generated_quadschrome.cc", "encodings/compact_lang_det/getonescriptspan.cc", "encodings/compact_lang_det/getonescriptspan.h", "encodings/compact_lang_det/letterscript_enum.cc", @@ -39,12 +63,6 @@ source_set("cld") { "encodings/compact_lang_det/utf8propjustletter.h", "encodings/compact_lang_det/utf8propletterscriptnum.h", "encodings/compact_lang_det/utf8scannotjustletterspecial.h", - "encodings/compact_lang_det/generated/cld_generated_score_quadchrome_0406.cc", - "encodings/compact_lang_det/generated/compact_lang_det_generated_cjkbis_0.cc", - "encodings/compact_lang_det/generated/compact_lang_det_generated_ctjkvz.cc", - "encodings/compact_lang_det/generated/compact_lang_det_generated_deltaoctachrome.cc", - "encodings/compact_lang_det/generated/compact_lang_det_generated_meanscore.h", - "encodings/compact_lang_det/generated/compact_lang_det_generated_quadschrome.cc", "encodings/compact_lang_det/win/cld_basictypes.h", "encodings/compact_lang_det/win/cld_commandlineflags.h", "encodings/compact_lang_det/win/cld_google.h", @@ -68,24 +86,6 @@ source_set("cld") { "languages/internal/languages.cc", "languages/proto/languages.pb.h", "languages/public/languages.h", - "base/basictypes.h", - "base/build_config.h", - "base/casts.h", - "base/commandlineflags.h", - "base/global_strip_options.h", - "base/logging.h", - "base/macros.h", - "base/port.h", - "base/crash.h", - "base/dynamic_annotations.h", - "base/scoped_ptr.h", - "base/stl_decl_msvc.h", - "base/log_severity.h", - "base/strtoint.h", - "base/vlog_is_on.h", - "base/string_util.h", - "base/type_traits.h", - "base/template_util.h", ] configs -= [ diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn index 8098eba..485f4ac 100644 --- a/third_party/cld_2/BUILD.gn +++ b/third_party/cld_2/BUILD.gn @@ -111,8 +111,8 @@ static_library("cld2_dynamic") { if (!is_win) { executable("cld_2_dynamic_data_tool") { sources = [ - "src/internal/cld2_dynamic_data_extractor.h", "src/internal/cld2_dynamic_data_extractor.cc", + "src/internal/cld2_dynamic_data_extractor.h", "src/internal/cld2_dynamic_data_tool.cc", ] diff --git a/third_party/elfutils/BUILD.gn b/third_party/elfutils/BUILD.gn index fca98ab..899bb5fe 100644 --- a/third_party/elfutils/BUILD.gn +++ b/third_party/elfutils/BUILD.gn @@ -12,17 +12,8 @@ source_set("libelf") { "src/libelf/abstract.h", "src/libelf/common.h", "src/libelf/dl-hash.h", - "src/libelf/elf.h", "src/libelf/elf-knowledge.h", - "src/libelf/exttypes.h", - "src/libelf/gelf.h", - "src/libelf/gelf_xlate.h", - "src/libelf/gnuhash_xlate.h", - "src/libelf/libelf.h", - "src/libelf/libelfP.h", - "src/libelf/nlist.h", - "src/libelf/note_xlate.h", - "src/libelf/version_xlate.h", + "src/libelf/elf.h", "src/libelf/elf32_checksum.c", "src/libelf/elf32_fsize.c", "src/libelf/elf32_getehdr.c", @@ -87,6 +78,8 @@ source_set("libelf") { "src/libelf/elf_strptr.c", "src/libelf/elf_update.c", "src/libelf/elf_version.c", + "src/libelf/exttypes.h", + "src/libelf/gelf.h", "src/libelf/gelf_checksum.c", "src/libelf/gelf_fsize.c", "src/libelf/gelf_getauxv.c", @@ -97,8 +90,8 @@ source_set("libelf") { "src/libelf/gelf_getmove.c", "src/libelf/gelf_getnote.c", "src/libelf/gelf_getphdr.c", - "src/libelf/gelf_getrela.c", "src/libelf/gelf_getrel.c", + "src/libelf/gelf_getrela.c", "src/libelf/gelf_getshdr.c", "src/libelf/gelf_getsym.c", "src/libelf/gelf_getsyminfo.c", @@ -117,8 +110,8 @@ source_set("libelf") { "src/libelf/gelf_update_lib.c", "src/libelf/gelf_update_move.c", "src/libelf/gelf_update_phdr.c", - "src/libelf/gelf_update_rela.c", "src/libelf/gelf_update_rel.c", + "src/libelf/gelf_update_rela.c", "src/libelf/gelf_update_shdr.c", "src/libelf/gelf_update_sym.c", "src/libelf/gelf_update_syminfo.c", @@ -129,11 +122,18 @@ source_set("libelf") { "src/libelf/gelf_update_verneed.c", "src/libelf/gelf_update_versym.c", "src/libelf/gelf_xlate.c", + "src/libelf/gelf_xlate.h", "src/libelf/gelf_xlatetof.c", "src/libelf/gelf_xlatetom.c", + "src/libelf/gnuhash_xlate.h", + "src/libelf/libelf.h", + "src/libelf/libelfP.h", "src/libelf/libelf_crc32.c", "src/libelf/libelf_next_prime.c", "src/libelf/nlist.c", + "src/libelf/nlist.h", + "src/libelf/note_xlate.h", + "src/libelf/version_xlate.h", ] include_dirs = [ diff --git a/third_party/fontconfig/BUILD.gn b/third_party/fontconfig/BUILD.gn index 21f42ce..9af485f 100644 --- a/third_party/fontconfig/BUILD.gn +++ b/third_party/fontconfig/BUILD.gn @@ -36,8 +36,8 @@ component("fontconfig") { "src/src/fcstat.c", "src/src/fcstr.c", "src/src/fcxml.c", - "src/src/ftglue.h", "src/src/ftglue.c", + "src/src/ftglue.h", ] include_dirs = [ diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn index 90b200f..b370348 100644 --- a/third_party/harfbuzz-ng/BUILD.gn +++ b/third_party/harfbuzz-ng/BUILD.gn @@ -47,91 +47,91 @@ if (use_system_harfbuzz) { "src/hb-atomic-private.hh", "src/hb-blob.cc", "src/hb-blob.h", - "src/hb-buffer.cc", "src/hb-buffer-deserialize-json.hh", "src/hb-buffer-deserialize-text.hh", - "src/hb-buffer.h", "src/hb-buffer-private.hh", "src/hb-buffer-serialize.cc", + "src/hb-buffer.cc", + "src/hb-buffer.h", "src/hb-cache-private.hh", "src/hb-common.cc", "src/hb-common.h", "src/hb-deprecated.h", + "src/hb-face-private.hh", "src/hb-face.cc", "src/hb-face.h", - "src/hb-face-private.hh", "src/hb-fallback-shape.cc", + "src/hb-font-private.hh", "src/hb-font.cc", "src/hb-font.h", - "src/hb-font-private.hh", - "src/hb.h", "src/hb-icu.cc", "src/hb-icu.h", "src/hb-mutex-private.hh", "src/hb-object-private.hh", "src/hb-open-file-private.hh", "src/hb-open-type-private.hh", - "src/hb-ot.h", "src/hb-ot-head-table.hh", "src/hb-ot-hhea-table.hh", "src/hb-ot-hmtx-table.hh", - "src/hb-ot-layout.cc", "src/hb-ot-layout-common-private.hh", "src/hb-ot-layout-gdef-table.hh", "src/hb-ot-layout-gpos-table.hh", - "src/hb-ot-layout-gsubgpos-private.hh", "src/hb-ot-layout-gsub-table.hh", - "src/hb-ot-layout.h", + "src/hb-ot-layout-gsubgpos-private.hh", "src/hb-ot-layout-private.hh", - "src/hb-ot-map.cc", + "src/hb-ot-layout.cc", + "src/hb-ot-layout.h", "src/hb-ot-map-private.hh", + "src/hb-ot-map.cc", "src/hb-ot-maxp-table.hh", "src/hb-ot-name-table.hh", - "src/hb-ot-shape.cc", - "src/hb-ot-shape-complex-arabic.cc", "src/hb-ot-shape-complex-arabic-fallback.hh", "src/hb-ot-shape-complex-arabic-table.hh", + "src/hb-ot-shape-complex-arabic.cc", "src/hb-ot-shape-complex-default.cc", "src/hb-ot-shape-complex-hangul.cc", "src/hb-ot-shape-complex-hebrew.cc", - "src/hb-ot-shape-complex-indic.cc", "src/hb-ot-shape-complex-indic-machine.hh", "src/hb-ot-shape-complex-indic-private.hh", "src/hb-ot-shape-complex-indic-table.cc", - "src/hb-ot-shape-complex-myanmar.cc", + "src/hb-ot-shape-complex-indic.cc", "src/hb-ot-shape-complex-myanmar-machine.hh", + "src/hb-ot-shape-complex-myanmar.cc", "src/hb-ot-shape-complex-private.hh", - "src/hb-ot-shape-complex-sea.cc", "src/hb-ot-shape-complex-sea-machine.hh", + "src/hb-ot-shape-complex-sea.cc", "src/hb-ot-shape-complex-thai.cc", "src/hb-ot-shape-complex-tibetan.cc", - "src/hb-ot-shape-fallback.cc", "src/hb-ot-shape-fallback-private.hh", - "src/hb-ot-shape.h", - "src/hb-ot-shape-normalize.cc", + "src/hb-ot-shape-fallback.cc", "src/hb-ot-shape-normalize-private.hh", + "src/hb-ot-shape-normalize.cc", "src/hb-ot-shape-private.hh", + "src/hb-ot-shape.cc", + "src/hb-ot-shape.h", "src/hb-ot-tag.cc", "src/hb-ot-tag.h", + "src/hb-ot.h", "src/hb-private.hh", + "src/hb-set-private.hh", "src/hb-set.cc", "src/hb-set.h", - "src/hb-set-private.hh", - "src/hb-shape.cc", - "src/hb-shape.h", + "src/hb-shape-plan-private.hh", "src/hb-shape-plan.cc", "src/hb-shape-plan.h", - "src/hb-shape-plan-private.hh", - "src/hb-shaper.cc", + "src/hb-shape.cc", + "src/hb-shape.h", "src/hb-shaper-impl-private.hh", "src/hb-shaper-list.hh", "src/hb-shaper-private.hh", + "src/hb-shaper.cc", + "src/hb-unicode-private.hh", "src/hb-unicode.cc", "src/hb-unicode.h", - "src/hb-unicode-private.hh", "src/hb-utf-private.hh", "src/hb-version.h", "src/hb-warning.cc", + "src/hb.h", ] defines = [ diff --git a/third_party/iaccessible2/BUILD.gn b/third_party/iaccessible2/BUILD.gn index 798f8d2..5b2a1a5 100644 --- a/third_party/iaccessible2/BUILD.gn +++ b/third_party/iaccessible2/BUILD.gn @@ -15,9 +15,9 @@ midl("iaccessible2") { # Generate a proxy DLL from the generated code. shared_library("IAccessible2Proxy") { sources = [ - "IAccessible2Proxy.def", "$target_gen_dir/ia2_api_all.dlldata.c", "$target_gen_dir/ia2_api_all_p.c", + "IAccessible2Proxy.def", ] defines = [ "REGISTER_PROXY_DLL" ] diff --git a/third_party/libexif/BUILD.gn b/third_party/libexif/BUILD.gn index de9b2ef..5a464e6 100644 --- a/third_party/libexif/BUILD.gn +++ b/third_party/libexif/BUILD.gn @@ -21,6 +21,9 @@ if (!is_linux || is_chromeos) { static_library("libexif") { sources = [ + "sources/libexif/canon/exif-mnote-data-canon.c", + "sources/libexif/canon/mnote-canon-entry.c", + "sources/libexif/canon/mnote-canon-tag.c", "sources/libexif/exif-byte-order.c", "sources/libexif/exif-content.c", "sources/libexif/exif-data.c", @@ -33,9 +36,6 @@ if (!is_linux || is_chromeos) { "sources/libexif/exif-mnote-data.c", "sources/libexif/exif-tag.c", "sources/libexif/exif-utils.c", - "sources/libexif/canon/exif-mnote-data-canon.c", - "sources/libexif/canon/mnote-canon-entry.c", - "sources/libexif/canon/mnote-canon-tag.c", "sources/libexif/fuji/exif-mnote-data-fuji.c", "sources/libexif/fuji/mnote-fuji-entry.c", "sources/libexif/fuji/mnote-fuji-tag.c", diff --git a/third_party/libxml/BUILD.gn b/third_party/libxml/BUILD.gn index 992e92a..299a110 100644 --- a/third_party/libxml/BUILD.gn +++ b/third_party/libxml/BUILD.gn @@ -27,24 +27,43 @@ config("libxml_config") { static_library("libxml") { output_name = "libxml2" sources = [ - "chromium/libxml_utils.h", "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", "linux/config.h", "linux/include/libxml/xmlversion.h", "mac/config.h", "mac/include/libxml/xmlversion.h", + "src/DOCBparser.c", + "src/HTMLparser.c", + "src/HTMLtree.c", + "src/SAX.c", + "src/SAX2.c", + "src/acconfig.h", + "src/c14n.c", + "src/catalog.c", + "src/chvalid.c", + "src/debugXML.c", + "src/dict.c", + "src/elfgcchack.h", + "src/encoding.c", + "src/entities.c", + "src/error.c", + "src/globals.c", + "src/hash.c", + "src/include/libxml/DOCBparser.h", + "src/include/libxml/HTMLparser.h", + "src/include/libxml/HTMLtree.h", + "src/include/libxml/SAX.h", + "src/include/libxml/SAX2.h", "src/include/libxml/c14n.h", "src/include/libxml/catalog.h", "src/include/libxml/chvalid.h", "src/include/libxml/debugXML.h", "src/include/libxml/dict.h", - "src/include/libxml/DOCBparser.h", "src/include/libxml/encoding.h", "src/include/libxml/entities.h", "src/include/libxml/globals.h", "src/include/libxml/hash.h", - "src/include/libxml/HTMLparser.h", - "src/include/libxml/HTMLtree.h", "src/include/libxml/list.h", "src/include/libxml/nanoftp.h", "src/include/libxml/nanohttp.h", @@ -52,8 +71,6 @@ static_library("libxml") { "src/include/libxml/parserInternals.h", "src/include/libxml/pattern.h", "src/include/libxml/relaxng.h", - "src/include/libxml/SAX.h", - "src/include/libxml/SAX2.h", "src/include/libxml/schemasInternals.h", "src/include/libxml/schematron.h", "src/include/libxml/threads.h", @@ -62,10 +79,10 @@ static_library("libxml") { "src/include/libxml/valid.h", "src/include/libxml/xinclude.h", "src/include/libxml/xlink.h", + "src/include/libxml/xmlIO.h", "src/include/libxml/xmlautomata.h", "src/include/libxml/xmlerror.h", "src/include/libxml/xmlexports.h", - "src/include/libxml/xmlIO.h", "src/include/libxml/xmlmemory.h", "src/include/libxml/xmlmodule.h", "src/include/libxml/xmlreader.h", @@ -81,21 +98,6 @@ static_library("libxml") { "src/include/libxml/xpointer.h", "src/include/win32config.h", "src/include/wsockcompat.h", - "src/acconfig.h", - "src/c14n.c", - "src/catalog.c", - "src/chvalid.c", - "src/debugXML.c", - "src/dict.c", - "src/DOCBparser.c", - "src/elfgcchack.h", - "src/encoding.c", - "src/entities.c", - "src/error.c", - "src/globals.c", - "src/hash.c", - "src/HTMLparser.c", - "src/HTMLtree.c", "src/legacy.c", "src/libxml.h", "src/list.c", @@ -105,8 +107,6 @@ static_library("libxml") { "src/parserInternals.c", "src/pattern.c", "src/relaxng.c", - "src/SAX.c", - "src/SAX2.c", "src/schematron.c", "src/threads.c", "src/tree.c", diff --git a/third_party/libxslt/BUILD.gn b/third_party/libxslt/BUILD.gn index 68d06c2..13800851 100644 --- a/third_party/libxslt/BUILD.gn +++ b/third_party/libxslt/BUILD.gn @@ -46,9 +46,9 @@ static_library("libxslt") { "libxslt/win32config.h", "libxslt/xslt.c", "libxslt/xslt.h", + "libxslt/xsltInternals.h", "libxslt/xsltconfig.h", "libxslt/xsltexports.h", - "libxslt/xsltInternals.h", "libxslt/xsltlocale.c", "libxslt/xsltlocale.h", "libxslt/xsltutils.c", diff --git a/third_party/lzma_sdk/BUILD.gn b/third_party/lzma_sdk/BUILD.gn index 32333af..ac31fc1 100644 --- a/third_party/lzma_sdk/BUILD.gn +++ b/third_party/lzma_sdk/BUILD.gn @@ -35,10 +35,10 @@ static_library("lzma_sdk") { "LzHash.h", "Lzma2Dec.c", "Lzma2Dec.h", - "LzmaEnc.c", - "LzmaEnc.h", "LzmaDec.c", "LzmaDec.h", + "LzmaEnc.c", + "LzmaEnc.h", "LzmaLib.c", "LzmaLib.h", "Types.h", diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn index 468a7e6..acdca86 100644 --- a/third_party/mesa/BUILD.gn +++ b/third_party/mesa/BUILD.gn @@ -149,19 +149,19 @@ static_library("mesa_libglslcommon") { "src/src/glsl/glsl_types.cpp", "src/src/glsl/glsl_types.h", "src/src/glsl/hir_field_selection.cpp", + "src/src/glsl/ir.cpp", + "src/src/glsl/ir.h", "src/src/glsl/ir_basic_block.cpp", "src/src/glsl/ir_basic_block.h", "src/src/glsl/ir_builder.cpp", "src/src/glsl/ir_builder.h", "src/src/glsl/ir_clone.cpp", "src/src/glsl/ir_constant_expression.cpp", - "src/src/glsl/ir.cpp", "src/src/glsl/ir_expression_flattening.cpp", "src/src/glsl/ir_expression_flattening.h", - "src/src/glsl/ir_function_can_inline.cpp", "src/src/glsl/ir_function.cpp", + "src/src/glsl/ir_function_can_inline.cpp", "src/src/glsl/ir_function_detect_recursion.cpp", - "src/src/glsl/ir.h", "src/src/glsl/ir_hierarchical_visitor.cpp", "src/src/glsl/ir_hierarchical_visitor.h", "src/src/glsl/ir_hv_accept.cpp", @@ -176,11 +176,11 @@ static_library("mesa_libglslcommon") { "src/src/glsl/ir_validate.cpp", "src/src/glsl/ir_variable_refcount.cpp", "src/src/glsl/ir_variable_refcount.h", - "src/src/glsl/linker.cpp", - "src/src/glsl/linker.h", "src/src/glsl/link_functions.cpp", "src/src/glsl/link_uniform_initializers.cpp", "src/src/glsl/link_uniforms.cpp", + "src/src/glsl/linker.cpp", + "src/src/glsl/linker.h", "src/src/glsl/loop_analysis.cpp", "src/src/glsl/loop_analysis.h", "src/src/glsl/loop_controls.cpp", @@ -250,7 +250,11 @@ static_library("mesa_libglslcommon") { static_library("mesa") { sources = [ "$generated_src_dir/mesa/builtin_function.cpp", + "$generated_src_dir/mesa/enums.c", "$generated_src_dir/mesa/glapi_mapi_tmp_shared.h", + "$generated_src_dir/mesa/lex.yy.c", + "$generated_src_dir/mesa/program/program_parse.tab.c", + "$generated_src_dir/mesa/program/program_parse.tab.h", "src/src/mapi/mapi/entry.c", "src/src/mapi/mapi/entry.h", "src/src/mapi/mapi/mapi_glapi.c", @@ -312,7 +316,6 @@ static_library("mesa") { "src/src/mesa/main/drawtex.h", "src/src/mesa/main/enable.c", "src/src/mesa/main/enable.h", - "$generated_src_dir/mesa/enums.c", "src/src/mesa/main/enums.h", "src/src/mesa/main/errors.c", "src/src/mesa/main/errors.h", @@ -474,7 +477,6 @@ static_library("mesa") { "src/src/mesa/program/hash_table.h", "src/src/mesa/program/ir_to_mesa.cpp", "src/src/mesa/program/ir_to_mesa.h", - "$generated_src_dir/mesa/lex.yy.c", "src/src/mesa/program/nvfragparse.c", "src/src/mesa/program/nvfragparse.h", "src/src/mesa/program/nvvertparse.c", @@ -500,8 +502,6 @@ static_library("mesa") { "src/src/mesa/program/prog_statevars.h", "src/src/mesa/program/program.c", "src/src/mesa/program/program.h", - "$generated_src_dir/mesa/program/program_parse.tab.c", - "$generated_src_dir/mesa/program/program_parse.tab.h", "src/src/mesa/program/program_parse_extra.c", "src/src/mesa/program/programopt.c", "src/src/mesa/program/programopt.h", diff --git a/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn index c9711c7..72e1c8f 100644 --- a/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/js/tests/BUILD.gn @@ -17,7 +17,7 @@ mojo_edk_source_set("js_to_cpp_tests") { "mojo/edk/js", "mojo/edk/test:test_support", ] - + mojo_sdk_deps = [ "mojo/public/cpp/bindings", "mojo/public/cpp/system", diff --git a/third_party/mojo/src/mojo/edk/system/BUILD.gn b/third_party/mojo/src/mojo/edk/system/BUILD.gn index d9dc930..a386ff9 100644 --- a/third_party/mojo/src/mojo/edk/system/BUILD.gn +++ b/third_party/mojo/src/mojo/edk/system/BUILD.gn @@ -194,8 +194,8 @@ test("mojo_system_unittests") { test("mojo_message_pipe_perftests") { sources = [ "message_pipe_perftest.cc", - "message_pipe_test_utils.h", "message_pipe_test_utils.cc", + "message_pipe_test_utils.h", ] deps = [ diff --git a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn index 05708c7..d60e99b 100644 --- a/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn +++ b/third_party/mojo/src/mojo/public/cpp/application/BUILD.gn @@ -11,17 +11,17 @@ mojo_sdk_source_set("application") { "application_delegate.h", "application_impl.h", "connect.h", - "service_provider_impl.h", "interface_factory.h", "interface_factory_impl.h", "lib/application_connection.cc", "lib/application_delegate.cc", "lib/application_impl.cc", - "lib/service_provider_impl.cc", "lib/service_connector.cc", "lib/service_connector.h", + "lib/service_provider_impl.cc", "lib/service_registry.cc", "lib/service_registry.h", + "service_provider_impl.h", ] mojo_sdk_deps = [ diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn index 515c3e1..7a3691a 100644 --- a/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn +++ b/third_party/mojo/src/mojo/public/cpp/bindings/BUILD.gn @@ -10,14 +10,6 @@ mojo_sdk_source_set("bindings") { "binding.h", "error_handler.h", "interface_ptr.h", - "map.h", - "message.h", - "message_filter.h", - "no_interface.h", - "strong_binding.h", - "string.h", - "struct_ptr.h", - "type_converter.h", "lib/array_internal.cc", "lib/array_internal.h", "lib/array_serialization.h", @@ -54,6 +46,14 @@ mojo_sdk_source_set("bindings") { "lib/validate_params.h", "lib/validation_errors.cc", "lib/validation_errors.h", + "map.h", + "message.h", + "message_filter.h", + "no_interface.h", + "string.h", + "strong_binding.h", + "struct_ptr.h", + "type_converter.h", ] deps = [ @@ -70,9 +70,9 @@ mojo_sdk_source_set("callback") { sources = [ "callback.h", "lib/callback_internal.h", - "lib/template_util.h", "lib/shared_data.h", "lib/shared_ptr.h", + "lib/template_util.h", ] mojo_sdk_deps = [ "mojo/public/cpp/system" ] diff --git a/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn index 87f24ff..9b192f1 100644 --- a/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn +++ b/third_party/mojo/src/mojo/public/cpp/environment/BUILD.gn @@ -7,8 +7,8 @@ import("../../mojo_sdk.gni") mojo_sdk_source_set("environment") { sources = [ "async_waiter.h", - "logging.h", "environment.h", + "logging.h", ] mojo_sdk_public_deps = [ "mojo/public/c/environment" ] diff --git a/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn index 9660a07..96c1d11 100644 --- a/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn +++ b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn @@ -6,16 +6,16 @@ import("../../mojo_sdk.gni") mojo_sdk_source_set("utility") { sources = [ - "mutex.h", - "run_loop.h", - "run_loop_handler.h", - "thread.h", "lib/mutex.cc", "lib/run_loop.cc", "lib/thread.cc", "lib/thread_local.h", "lib/thread_local_posix.cc", "lib/thread_local_win.cc", + "mutex.h", + "run_loop.h", + "run_loop_handler.h", + "thread.h", ] mojo_sdk_deps = [ @@ -26,10 +26,10 @@ mojo_sdk_source_set("utility") { if (is_win) { # See crbug.com/342893: sources -= [ - "mutex.h", - "thread.h", "lib/mutex.cc", "lib/thread.cc", + "mutex.h", + "thread.h", ] } } diff --git a/third_party/mojo/src/mojo/public/platform/native/BUILD.gn b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn index a369e17..d67608b 100644 --- a/third_party/mojo/src/mojo/public/platform/native/BUILD.gn +++ b/third_party/mojo/src/mojo/public/platform/native/BUILD.gn @@ -6,8 +6,8 @@ import("../../mojo_sdk.gni") mojo_sdk_source_set("system") { sources = [ - "system_thunks.h", "system_thunks.cc", + "system_thunks.h", ] defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ] mojo_sdk_deps = [ "mojo/public/c/system" ] @@ -24,14 +24,14 @@ mojo_sdk_source_set("system") { mojo_sdk_source_set("gles2") { sources = [ - "gles2_thunks.cc", - "gles2_thunks.h", - "gles2_impl_thunks.cc", - "gles2_impl_thunks.h", - "gles2_impl_chromium_texture_mailbox_thunks.cc", - "gles2_impl_chromium_texture_mailbox_thunks.h", "gles2_impl_chromium_sync_point_thunks.cc", "gles2_impl_chromium_sync_point_thunks.h", + "gles2_impl_chromium_texture_mailbox_thunks.cc", + "gles2_impl_chromium_texture_mailbox_thunks.h", + "gles2_impl_thunks.cc", + "gles2_impl_thunks.h", + "gles2_thunks.cc", + "gles2_thunks.h", ] defines = [ "MOJO_GLES2_IMPLEMENTATION" ] diff --git a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn index e7a75f2..bf9b729 100644 --- a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn +++ b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn @@ -7,8 +7,8 @@ import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni") mojom("interfaces") { sources = [ - "input_events.mojom", "input_event_constants.mojom", + "input_events.mojom", "input_key_codes.mojom", ] diff --git a/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn index 035ddfa..af47d38 100644 --- a/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn +++ b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn @@ -8,7 +8,7 @@ import("$mojo_sdk_root/mojo/public/mojo_sdk.gni") mojo_sdk_source_set("args") { public_configs = [ "../../../public/build/config:mojo_services" ] sources = [ - "lib/args.cc", "args.h", + "lib/args.cc", ] } diff --git a/third_party/npapi/BUILD.gn b/third_party/npapi/BUILD.gn index ad17083..7314702 100644 --- a/third_party/npapi/BUILD.gn +++ b/third_party/npapi/BUILD.gn @@ -19,8 +19,8 @@ source_set("npapi") { "bindings/npapi_x11.h", "bindings/npfunctions.h", "bindings/nphostapi.h", - "bindings/nptypes.h", "bindings/npruntime.h", + "bindings/nptypes.h", ] public_configs = [ ":npapi_config" ] diff --git a/third_party/opus/BUILD.gn b/third_party/opus/BUILD.gn index fefba04..57196e5 100644 --- a/third_party/opus/BUILD.gn +++ b/third_party/opus/BUILD.gn @@ -122,10 +122,10 @@ source_set("opus") { "src/celt/arm/kiss_fft_armv4.h", "src/celt/arm/kiss_fft_armv5e.h", "src/celt/pitch_arm.h", - "src/silk/arm/macro_armv4.h", - "src/silk/arm/macro_armv5e.h", "src/silk/arm/SigProc_FIX_armv4.h", "src/silk/arm/SigProc_FIX_armv5e.h", + "src/silk/arm/macro_armv4.h", + "src/silk/arm/macro_armv5e.h", ] defines += [ @@ -136,10 +136,10 @@ source_set("opus") { if (use_opus_rtcd) { sources += [ + "$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", "src/celt/arm/arm_celt_map.c", "src/celt/arm/armcpu.c", "src/celt/arm/armcpu.h", - "$target_gen_dir/celt_pitch_xcorr_arm_gnu.S", ] defines += [ diff --git a/third_party/ots/BUILD.gn b/third_party/ots/BUILD.gn index 513dce6..c9d339a 100644 --- a/third_party/ots/BUILD.gn +++ b/third_party/ots/BUILD.gn @@ -8,8 +8,8 @@ config("ots_config") { source_set("ots") { sources = [ - "include/ots-memory-stream.h", "include/opentype-sanitiser.h", + "include/ots-memory-stream.h", "src/cff.cc", "src/cff.h", "src/cff_type2_charstring.cc", @@ -46,10 +46,10 @@ source_set("ots") { "src/loca.h", "src/ltsh.cc", "src/ltsh.h", - "src/maxp.cc", - "src/maxp.h", "src/math.cc", "src/math_.h", + "src/maxp.cc", + "src/maxp.h", "src/metrics.cc", "src/metrics.h", "src/name.cc", diff --git a/third_party/protobuf/BUILD.gn b/third_party/protobuf/BUILD.gn index 6825f1e..7c036ee 100644 --- a/third_party/protobuf/BUILD.gn +++ b/third_party/protobuf/BUILD.gn @@ -95,6 +95,7 @@ component("protobuf_lite") { } public_configs = [ ":protobuf_config", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. "//build/config/compiler:no_size_t_to_int_warning", ] @@ -118,57 +119,57 @@ source_set("protobuf_full") { sources = protobuf_lite_sources sources += [ + "src/google/protobuf/compiler/code_generator.h", + "src/google/protobuf/compiler/command_line_interface.h", + "src/google/protobuf/compiler/importer.h", + "src/google/protobuf/compiler/java/java_doc_comment.cc", + "src/google/protobuf/compiler/java/java_doc_comment.h", + "src/google/protobuf/compiler/parser.h", + "src/google/protobuf/descriptor.cc", "src/google/protobuf/descriptor.h", + "src/google/protobuf/descriptor.pb.cc", "src/google/protobuf/descriptor.pb.h", + "src/google/protobuf/descriptor_database.cc", "src/google/protobuf/descriptor_database.h", + "src/google/protobuf/dynamic_message.cc", "src/google/protobuf/dynamic_message.h", + "src/google/protobuf/extension_set_heavy.cc", "src/google/protobuf/generated_enum_reflection.h", + "src/google/protobuf/generated_message_reflection.cc", "src/google/protobuf/generated_message_reflection.h", - "src/google/protobuf/message.h", - "src/google/protobuf/reflection_ops.h", - "src/google/protobuf/service.h", - "src/google/protobuf/text_format.h", - "src/google/protobuf/wire_format.h", "src/google/protobuf/io/gzip_stream.h", "src/google/protobuf/io/printer.h", "src/google/protobuf/io/tokenizer.h", "src/google/protobuf/io/zero_copy_stream_impl.h", - "src/google/protobuf/compiler/code_generator.h", - "src/google/protobuf/compiler/command_line_interface.h", - "src/google/protobuf/compiler/importer.h", - "src/google/protobuf/compiler/java/java_doc_comment.cc", - "src/google/protobuf/compiler/java/java_doc_comment.h", - "src/google/protobuf/compiler/parser.h", - "src/google/protobuf/stubs/strutil.cc", - "src/google/protobuf/stubs/strutil.h", - "src/google/protobuf/stubs/substitute.cc", - "src/google/protobuf/stubs/substitute.h", + "src/google/protobuf/message.cc", + "src/google/protobuf/message.h", + "src/google/protobuf/reflection_ops.cc", + "src/google/protobuf/reflection_ops.h", + "src/google/protobuf/service.cc", + "src/google/protobuf/service.h", "src/google/protobuf/stubs/stl_util.h", "src/google/protobuf/stubs/stringprintf.cc", "src/google/protobuf/stubs/stringprintf.h", "src/google/protobuf/stubs/structurally_valid.cc", + "src/google/protobuf/stubs/strutil.cc", + "src/google/protobuf/stubs/strutil.h", + "src/google/protobuf/stubs/substitute.cc", + "src/google/protobuf/stubs/substitute.h", "src/google/protobuf/stubs/template_util.h", "src/google/protobuf/stubs/type_traits.h", - "src/google/protobuf/descriptor.cc", - "src/google/protobuf/descriptor.pb.cc", - "src/google/protobuf/descriptor_database.cc", - "src/google/protobuf/dynamic_message.cc", - "src/google/protobuf/extension_set_heavy.cc", - "src/google/protobuf/generated_message_reflection.cc", - "src/google/protobuf/message.cc", - "src/google/protobuf/reflection_ops.cc", - "src/google/protobuf/service.cc", "src/google/protobuf/text_format.cc", + "src/google/protobuf/text_format.h", "src/google/protobuf/wire_format.cc", + "src/google/protobuf/wire_format.h", # This file pulls in zlib, but it's not actually used by protoc, so # instead of compiling zlib for the host, let's just exclude this. # "src/src/google/protobuf/io/gzip_stream.cc", + "src/google/protobuf/compiler/importer.cc", + "src/google/protobuf/compiler/parser.cc", "src/google/protobuf/io/printer.cc", "src/google/protobuf/io/tokenizer.cc", "src/google/protobuf/io/zero_copy_stream_impl.cc", - "src/google/protobuf/compiler/importer.cc", - "src/google/protobuf/compiler/parser.cc", ] configs -= [ "//build/config/compiler:chromium_code" ] @@ -178,6 +179,7 @@ source_set("protobuf_full") { } public_configs = [ ":protobuf_config", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. "//build/config/compiler:no_size_t_to_int_warning", ] @@ -191,12 +193,6 @@ if (current_toolchain == host_toolchain) { sources = [ "src/google/protobuf/compiler/code_generator.cc", "src/google/protobuf/compiler/command_line_interface.cc", - "src/google/protobuf/compiler/plugin.cc", - "src/google/protobuf/compiler/plugin.pb.cc", - "src/google/protobuf/compiler/subprocess.cc", - "src/google/protobuf/compiler/subprocess.h", - "src/google/protobuf/compiler/zip_writer.cc", - "src/google/protobuf/compiler/zip_writer.h", "src/google/protobuf/compiler/cpp/cpp_enum.cc", "src/google/protobuf/compiler/cpp/cpp_enum.h", "src/google/protobuf/compiler/cpp/cpp_enum_field.cc", @@ -243,8 +239,14 @@ if (current_toolchain == host_toolchain) { "src/google/protobuf/compiler/java/java_service.h", "src/google/protobuf/compiler/java/java_string_field.cc", "src/google/protobuf/compiler/java/java_string_field.h", - "src/google/protobuf/compiler/python/python_generator.cc", "src/google/protobuf/compiler/main.cc", + "src/google/protobuf/compiler/plugin.cc", + "src/google/protobuf/compiler/plugin.pb.cc", + "src/google/protobuf/compiler/python/python_generator.cc", + "src/google/protobuf/compiler/subprocess.cc", + "src/google/protobuf/compiler/subprocess.h", + "src/google/protobuf/compiler/zip_writer.cc", + "src/google/protobuf/compiler/zip_writer.h", ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/third_party/speex/BUILD.gn b/third_party/speex/BUILD.gn index 1b5dc9a..02a7942 100644 --- a/third_party/speex/BUILD.gn +++ b/third_party/speex/BUILD.gn @@ -8,6 +8,17 @@ config("speex_config") { source_set("speex") { sources = [ + "include/speex/speex.h", + "include/speex/speex_bits.h", + "include/speex/speex_buffer.h", + "include/speex/speex_callbacks.h", + "include/speex/speex_echo.h", + "include/speex/speex_header.h", + "include/speex/speex_jitter.h", + "include/speex/speex_preprocess.h", + "include/speex/speex_resampler.h", + "include/speex/speex_stereo.h", + "include/speex/speex_types.h", "libspeex/arch.h", "libspeex/bits.c", "libspeex/cb_search.c", @@ -54,17 +65,6 @@ source_set("speex") { "libspeex/vq.c", "libspeex/vq.h", "libspeex/window.c", - "include/speex/speex.h", - "include/speex/speex_bits.h", - "include/speex/speex_buffer.h", - "include/speex/speex_callbacks.h", - "include/speex/speex_echo.h", - "include/speex/speex_header.h", - "include/speex/speex_jitter.h", - "include/speex/speex_preprocess.h", - "include/speex/speex_resampler.h", - "include/speex/speex_stereo.h", - "include/speex/speex_types.h", ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/third_party/sqlite/BUILD.gn b/third_party/sqlite/BUILD.gn index 62efc0a..686863b 100644 --- a/third_party/sqlite/BUILD.gn +++ b/third_party/sqlite/BUILD.gn @@ -8,8 +8,8 @@ config("sqlite_config") { source_set("sqlite") { sources = [ - "amalgamation/sqlite3.h", "amalgamation/sqlite3.c", + "amalgamation/sqlite3.h", # fts2.c currently has a lot of conflicts when added to # the amalgamation. It is probably not worth fixing that. diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn index a09a495..9ed8e46 100644 --- a/third_party/yasm/BUILD.gn +++ b/third_party/yasm/BUILD.gn @@ -124,13 +124,13 @@ if (current_toolchain == host_toolchain) { executable("re2c") { sources = [ - "source/patched-yasm/tools/re2c/main.c", + "source/patched-yasm/tools/re2c/actions.c", "source/patched-yasm/tools/re2c/code.c", "source/patched-yasm/tools/re2c/dfa.c", + "source/patched-yasm/tools/re2c/main.c", + "source/patched-yasm/tools/re2c/mbo_getopt.c", "source/patched-yasm/tools/re2c/parser.c", - "source/patched-yasm/tools/re2c/actions.c", "source/patched-yasm/tools/re2c/scanner.c", - "source/patched-yasm/tools/re2c/mbo_getopt.c", "source/patched-yasm/tools/re2c/substr.c", "source/patched-yasm/tools/re2c/translate.c", ] @@ -203,8 +203,8 @@ if (current_toolchain == host_toolchain) { "source/patched-yasm/modules/objfmts/macho/macho-objfmt.c", "source/patched-yasm/modules/objfmts/rdf/rdf-objfmt.c", "source/patched-yasm/modules/objfmts/xdf/xdf-objfmt.c", - "source/patched-yasm/modules/parsers/gas/gas-parse.c", "source/patched-yasm/modules/parsers/gas/gas-parse-intel.c", + "source/patched-yasm/modules/parsers/gas/gas-parse.c", "source/patched-yasm/modules/parsers/gas/gas-parser.c", "source/patched-yasm/modules/parsers/nasm/nasm-parse.c", "source/patched-yasm/modules/parsers/nasm/nasm-parser.c", diff --git a/tools/generate_library_loader/generate_library_loader.gni b/tools/generate_library_loader/generate_library_loader.gni index 2b6874a..24f753b 100644 --- a/tools/generate_library_loader/generate_library_loader.gni +++ b/tools/generate_library_loader/generate_library_loader.gni @@ -60,8 +60,8 @@ template("generate_library_loader") { public_configs = [ invoker.config ] } sources = [ - output_h, output_cc, + output_h, ] deps = [ ":${target_name}_loader", diff --git a/tools/gn/BUILD.gn b/tools/gn/BUILD.gn index e0de60e..bc37bc7 100644 --- a/tools/gn/BUILD.gn +++ b/tools/gn/BUILD.gn @@ -55,9 +55,6 @@ static_library("gn_lib") { "exec_process.h", "filesystem_utils.cc", "filesystem_utils.h", - "functions.cc", - "functions.h", - "functions_target.cc", "function_exec_script.cc", "function_foreach.cc", "function_get_label_info.cc", @@ -71,6 +68,9 @@ static_library("gn_lib") { "function_template.cc", "function_toolchain.cc", "function_write_file.cc", + "functions.cc", + "functions.h", + "functions_target.cc", "group_target_generator.cc", "group_target_generator.h", "header_checker.cc", @@ -104,12 +104,12 @@ static_library("gn_lib") { "ninja_copy_target_writer.h", "ninja_group_target_writer.cc", "ninja_group_target_writer.h", - "ninja_utils.cc", - "ninja_utils.h", "ninja_target_writer.cc", "ninja_target_writer.h", "ninja_toolchain_writer.cc", "ninja_toolchain_writer.h", + "ninja_utils.cc", + "ninja_utils.h", "ninja_writer.cc", "ninja_writer.h", "operators.cc", @@ -163,9 +163,9 @@ static_library("gn_lib") { "token.cc", "token.h", "tokenizer.cc", + "tokenizer.h", "tool.cc", "tool.h", - "tokenizer.h", "toolchain.cc", "toolchain.h", "trace.cc", diff --git a/tools/imagediff/BUILD.gn b/tools/imagediff/BUILD.gn index 887f412..7b31672 100644 --- a/tools/imagediff/BUILD.gn +++ b/tools/imagediff/BUILD.gn @@ -6,8 +6,8 @@ executable("imagediff") { output_name = "image_diff" # Different than dir nam for historical reasons. sources = [ "image_diff.cc", - "image_diff_png.h", "image_diff_png.cc", + "image_diff_png.h", ] configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/tools/json_schema_compiler/test/BUILD.gn b/tools/json_schema_compiler/test/BUILD.gn index 9b0c1b9..33e6219 100644 --- a/tools/json_schema_compiler/test/BUILD.gn +++ b/tools/json_schema_compiler/test/BUILD.gn @@ -15,15 +15,15 @@ json_schema_api("api") { "choices.json", "crossref.json", "enums.json", + "error_generation.json", "functions_as_parameters.json", "functions_on_types.json", "idl_basics.idl", + "idl_object_types.idl", "idl_other_namespace.idl", "idl_other_namespace_sub_namespace.idl", - "idl_object_types.idl", "objects.json", "simple_api.json", - "error_generation.json", ] schemas = true diff --git a/tools/relocation_packer/BUILD.gn b/tools/relocation_packer/BUILD.gn index e95dbcf..563a64d 100644 --- a/tools/relocation_packer/BUILD.gn +++ b/tools/relocation_packer/BUILD.gn @@ -28,8 +28,8 @@ if (current_toolchain == host_toolchain) { "src/elf_file.cc", "src/leb128.cc", "src/packer.cc", - "src/sleb128.cc", "src/run_length_encoder.cc", + "src/sleb128.cc", ] } @@ -53,9 +53,9 @@ if (current_toolchain == host_toolchain) { "src/elf_file_unittest.cc", "src/leb128_unittest.cc", "src/packer_unittest.cc", - "src/sleb128_unittest.cc", - "src/run_length_encoder_unittest.cc", "src/run_all_unittests.cc", + "src/run_length_encoder_unittest.cc", + "src/sleb128_unittest.cc", ] rebased_test_data = rebase_path("test_data", root_build_dir) data = [ diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn index 2d13278..d168b5e 100644 --- a/ui/accessibility/BUILD.gn +++ b/ui/accessibility/BUILD.gn @@ -31,8 +31,8 @@ component("accessibility") { "platform/ax_platform_node_delegate.h", "platform/ax_platform_node_mac.h", "platform/ax_platform_node_mac.mm", - "platform/ax_platform_node_win.h", "platform/ax_platform_node_win.cc", + "platform/ax_platform_node_win.h", ] defines = [ "ACCESSIBILITY_IMPLEMENTATION" ] diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn index f42595b..c856716 100644 --- a/ui/events/BUILD.gn +++ b/ui/events/BUILD.gn @@ -353,10 +353,10 @@ test("events_unittests") { if (is_nacl) { source_set("latency_info") { sources = [ - "latency_info.cc", - "latency_info.h", "ipc/latency_info_param_traits.cc", "ipc/latency_info_param_traits.h", + "latency_info.cc", + "latency_info.h", ] } } diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn index a28d701..6868897 100644 --- a/ui/ozone/BUILD.gn +++ b/ui/ozone/BUILD.gn @@ -75,9 +75,6 @@ component("ozone_base") { component("ozone") { sources = [ - platform_list_cc_file, - platform_list_h_file, - constructor_list_cc_file, "common/display_mode_proxy.cc", "common/display_mode_proxy.h", "common/display_snapshot_proxy.cc", @@ -103,6 +100,9 @@ component("ozone") { "public/ozone_platform.h", "public/ozone_switches.cc", "public/ozone_switches.h", + constructor_list_cc_file, + platform_list_cc_file, + platform_list_h_file, ] defines = [ "OZONE_IMPLEMENTATION" ] diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn index 7f90bbb..7af6867 100644 --- a/webkit/common/gpu/BUILD.gn +++ b/webkit/common/gpu/BUILD.gn @@ -16,6 +16,7 @@ component("gpu") { defines = [ "WEBKIT_GPU_IMPLEMENTATION" ] configs += [ "//build/config/compiler:wexit_time_destructors", + # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. "//build/config/compiler:no_size_t_to_int_warning", ] |