From 8241df7edc53b8777e7f71ff379fa53f368c3a28 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 6 Nov 2015 14:38:48 -0800 Subject: Merge to XFA: Fix all relative includes to third_party. - In non-standalone builds, use the provided jpeg library. - Run gn format over all the GN files. - Also roll DEPS for buildtools to c2f2598. - And fix XFA's lack of #includes. BUG=541704 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425153006 . (cherry picked from commit 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c) Review URL: https://codereview.chromium.org/1434543003 . --- third_party/third_party.gyp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'third_party/third_party.gyp') diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 55a7e3392e..25e7050ee2 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -11,6 +11,11 @@ 'PNG_USE_READ_MACROS', '_CRT_SECURE_NO_WARNINGS', ], + 'include_dirs': [ + # This is implicit in GN. + '<(DEPTH)', + '..', + ], 'msvs_disabled_warnings': [ 4005, 4018, 4146, 4333, 4345, 4267 ], @@ -148,7 +153,7 @@ }, }, { - 'target_name': 'fx_libjpeg', + 'target_name': 'libjpeg', 'type': 'static_library', 'sources': [ 'libjpeg/cderror.h', -- cgit v1.2.3