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 . --- core/src/fxcodec/DEPS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/DEPS') diff --git a/core/src/fxcodec/DEPS b/core/src/fxcodec/DEPS index 48eaa048e0..a88b3294a9 100644 --- a/core/src/fxcodec/DEPS +++ b/core/src/fxcodec/DEPS @@ -1,6 +1,8 @@ include_rules = [ '+third_party/lcms2-2.6', - '+third_party/libjpeg', + '+third_party/libjpeg/jpeglib.h', + # For non-standalone builds that may use libjpeg_turbo. + '+third_party/libjpeg_turbo/jpeglib.h', '+third_party/libopenjpeg20', '+third_party/zlib_v128', -] \ No newline at end of file +] -- cgit v1.2.3