diff options
| author | thestig <thestig@chromium.org> | 2016-08-30 21:56:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-08-30 21:56:33 -0700 |
| commit | c65e11ee1bef647e87f2573848d5b49a6236ecf8 (patch) | |
| tree | db5dce4b661460ddb2282785531e03a67896a335 | |
| parent | 77be04971c130cadbbdba04814f3d77ef25548bc (diff) | |
| download | pdfium-c65e11ee1bef647e87f2573848d5b49a6236ecf8.tar.xz | |
Roll DEPS for build to b73bafdd.
Also roll:
buildtools to adb8bf4e.
skia to 3ee255f2.
v8 to 3d96d7ee.
And make tweaks to get it all working.
Review-Url: https://codereview.chromium.org/2283883002
| -rw-r--r-- | BUILD.gn | 6 | ||||
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | build_overrides/build.gni | 8 | ||||
| -rw-r--r-- | testing/test.gni | 9 |
4 files changed, 23 insertions, 8 deletions
@@ -706,6 +706,8 @@ static_library("fxcrt") { "core/fxcrt/plex.h", "core/fxcrt/xml_int.h", ] + configs += [ ":pdfium_core_config" ] + if (pdf_enable_xfa) { sources += [ "core/fxcrt/fx_arabic.cpp", @@ -714,7 +716,6 @@ static_library("fxcrt") { "core/fxcrt/include/fx_arb.h", ] } - configs += [ ":pdfium_core_config" ] } static_library("fxge") { @@ -1691,6 +1692,8 @@ test("pdfium_embeddertests") { "//testing/gtest", ] include_dirs = [ "testing/gmock/include" ] + configs += [ ":pdfium_core_config" ] + if (pdf_enable_v8) { sources += [ "fpdfsdk/javascript/public_methods_embeddertest.cpp", @@ -1701,7 +1704,6 @@ test("pdfium_embeddertests") { deps += [ ":fxjs" ] configs += [ "//v8:external_startup_data" ] } - configs += [ ":pdfium_core_config" ] if (is_android) { ignore_all_data_deps = true use_raw_android_executable = true @@ -5,8 +5,8 @@ vars = { 'pdfium_git': 'https://pdfium.googlesource.com', 'android_ndk_revision': '5022f40f12953c02b2614c5f7beb981ec5d0e833', - 'build_revision': '76d9f8b4fcae07fb82f28295468cf92bade935bd', - 'buildtools_revision': 'db6179b29f90d28026b0cb23ef71d56ec31b8bd6', + 'build_revision': 'b73bafdd0ff0efc8835de6e646b47eec0a2a38a4', + 'buildtools_revision': 'adb8bf4e8fc92aa1717bf151b862d58e6f27c4f2', 'catapult_revision': '327256cb1c387e62a2c7e6960e2398867665fb51', 'clang_revision': '797371be0a75c9892d6acb486d0430915ea538a6', 'cygwin_revision': 'c89e446b273697fadf3a10ff1007a97c0b7de6df', @@ -15,10 +15,10 @@ vars = { 'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038', 'icu_revision': '2341038bf72869a5683a893a2b319a48ffec7f62', 'pdfium_tests_revision': '5867fa68fa3e00016d3e31374e84eb01a3db6ac7', - 'skia_revision': '3bf7509c3f68aefbe5f8b2ea5888319a71a91d2d', + 'skia_revision': '3ee255f259541eff1251c8007f9135e8d664346a', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', 'trace_event_revision': '54b8455be9505c2cb0cf5c26bb86739c236471aa', - 'v8_revision': '75f10f91b1b0b392d2a29a7a480bf079db6f43fa', + 'v8_revision': '3d96d7eecdef82d092889703f56e81d897dcf390', } deps = { diff --git a/build_overrides/build.gni b/build_overrides/build.gni index c172f9cc8d..bce8d28f00 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -17,11 +17,15 @@ build_with_chromium = true # Support different NDK locations in non-Chromium builds. default_android_ndk_root = "//third_party/android_ndk" default_android_ndk_version = "r11c" +default_android_ndk_major_version = "11" -# Some non-Chromium builds don't support building java targets. +# PDFium builds don't support building java targets. enable_java_templates = false # Whether to use the neon FPU instruction set or not. -if (current_cpu == "arm" ) { +if (current_cpu == "arm") { arm_use_neon = true } + +# PDFium builds don't use Chromium's third_party/binutils. +linux_use_bundled_binutils_override = false diff --git a/testing/test.gni b/testing/test.gni index 3f6f175613..535a749101 100644 --- a/testing/test.gni +++ b/testing/test.gni @@ -372,3 +372,12 @@ template("test") { } } } + +# Test defaults. +set_defaults("test") { + if (is_android) { + configs = default_shared_library_configs + } else { + configs = default_executable_configs + } +} |