commit d3a0c1cb66e12527db8cb7aac48475053533c0e8
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 24 03:20:53 2012
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 24 03:20:53 2012
tree bb3a5e80416c43b8ac6b5a18fc79ffda4ea8456b
parent 4bc24c4afa58458a1577146c45ab9bd959edc83c

Merge /branches/3.2:r1378 to /trunk

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1521 4adac7df-926f-26a2-2b94-8c16560cd09d

src/common_video/jpeg/main/source/jpeg.gypi

diff --git a/src/common_video/jpeg/main/source/jpeg.gypi b/src/common_video/jpeg/main/source/jpeg.gypi
index eec92dd..550073d 100644
--- a/src/common_video/jpeg/main/source/jpeg.gypi
+++ b/src/common_video/jpeg/main/source/jpeg.gypi
@@ -49,6 +49,9 @@
               ],
             }],
           ],
+        }, {
+          # Need to add a directory normally exported by libjpeg.gyp.
+          'include_dirs': [ '<(DEPTH)/third_party/libjpeg', ],
         }],
       ],
       'sources': [