diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-19 11:00:56 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-20 15:01:16 +0000 |
| commit | 4c577fc26708d7fa654db7d623978b107d87a000 (patch) | |
| tree | a1c0290deea279a3bcbaa07f9cc3df9198f80661 | |
| parent | 29048c86be4b068e919fa57928c8f79f62785d92 (diff) | |
Fix building ANGLE
Use the first bundled jsoncpp instead of ANGLE's second bundled copy.
Change-Id: I7cc2e051a9a26be9e9e223da8ea7877d27688089
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/third_party/angle/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/third_party/angle/src/tests/BUILD.gn | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/chromium/third_party/angle/BUILD.gn b/chromium/third_party/angle/BUILD.gn index b2440d1c268..b453155c9f3 100644 --- a/chromium/third_party/angle/BUILD.gn +++ b/chromium/third_party/angle/BUILD.gn @@ -943,7 +943,7 @@ angle_shared_library("libfeature_support${angle_libs_suffix}") { public_configs += [ ":angle_feature_support_config", - "third_party/jsoncpp:jsoncpp_config", + "//third_party/jsoncpp:jsoncpp_config", ] sources = [ @@ -953,7 +953,7 @@ angle_shared_library("libfeature_support${angle_libs_suffix}") { deps = [ ":angle_gpu_info_util", - "third_party/jsoncpp:jsoncpp", + "//third_party/jsoncpp:jsoncpp", ] } diff --git a/chromium/third_party/angle/src/tests/BUILD.gn b/chromium/third_party/angle/src/tests/BUILD.gn index 8c0f454fa8e..89574c2c020 100644 --- a/chromium/third_party/angle/src/tests/BUILD.gn +++ b/chromium/third_party/angle/src/tests/BUILD.gn @@ -237,7 +237,6 @@ if (is_win || is_linux || is_android || is_mac) { angle_root + ":libANGLE", angle_root + ":libEGL_static", angle_root + ":libGLESv2_static", - angle_root + "/third_party/jsoncpp:jsoncpp", ":angle_perftests_main", ] @@ -267,7 +266,6 @@ if (is_win || is_linux || is_android || is_mac) { sources = angle_perf_tests_sources deps = [ - angle_root + "/third_party/jsoncpp:jsoncpp", angle_root + ":angle_common", angle_root + ":angle_system_utils", angle_root + ":angle_util", |