Add ifdef for jpeglibmangler

Bug: b/184745328

Only include jpeglibmangler when a new flag (MANGLE_JPEG_NAMES) is
defined. Define the flag in BUILD.gn. This will allow the Android
platform to sync to this version, not define the flag in its own build
files, and properly exclude jpeglibmangler.h.

Change-Id: I510b4abde046172f2b96c09a23481404402d2217

2 files changed, 3 insertions, 0 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 5befffd7..d9802996 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -21,6 +21,7 @@ source_set("libjpeg_headers") {
     "jpeglib.h",
     "jpeglibmangler.h",
   ]
+  defines = [ "MANGLE_JPEG_NAMES" ]
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
diff --git a/jpeglib.h b/jpeglib.h
index 979ef7c8..a7179282 100644
--- a/jpeglib.h
+++ b/jpeglib.h
@@ -19,7 +19,9 @@
 #define JPEGLIB_H
 
 /* Begin chromium edits */
+#ifdef MANGLE_JPEG_NAMES
 #include "jpeglibmangler.h"
+#endif
 /* End chromium edits */
 
 /*