Build fixes needed by Firefox circa 2021-feb.

Bug: angleproject:6187
Change-Id: Ife2c9f08ca213358b8fb06a858664d235a860730
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3036592


Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

scripts/export_targets.py

@@ -207,6 +207,7 @@ IGNORED_INCLUDES = {
     b'libANGLE/renderer/null/DisplayNULL.h',
     b'libANGLE/renderer/vulkan/android/AHBFunctions.h',
     b'libANGLE/renderer/vulkan/android/DisplayVkAndroid.h',
+    b'libANGLE/renderer/vulkan/DisplayVk_api.h',
     b'libANGLE/renderer/vulkan/fuchsia/DisplayVkFuchsia.h',
     b'libANGLE/renderer/vulkan/ggp/DisplayVkGGP.h',
     b'libANGLE/renderer/vulkan/mac/DisplayVkMac.h',
@@ -340,8 +341,8 @@ for (k,desc) in out.items():
     for dep_name in set(desc['deps']):
         dep = descs[dep_name]
         if dep['type'] in LIBRARY_TYPES:
-            dep_libs.add(dep_name[3:])
-    desc['deps'] = sortedi(dep_libs)
+            dep_libs.add(dep_name)
+    desc['dep_libs'] = sortedi(dep_libs)
 
 json.dump(out, sys.stdout, indent='  ')
 exit(0)

src/libANGLE/MemoryProgramCache.cpp

@@ -7,6 +7,10 @@
 //   always have to be re-compiled. Can be used in conjunction with the platform
 //   layer to warm up the cache from disk.
 
+// Include zlib first, otherwise FAR gets defined elsewhere.
+#define USE_SYSTEM_ZLIB
+#include "compression_utils_portable.h"
+
 #include "libANGLE/MemoryProgramCache.h"
 
 #include <GLSLANG/ShaderVars.h>

src/libGLESv2.gni

@@ -295,6 +295,7 @@ libangle_headers = [
   "src/libANGLE/renderer/FramebufferAttachmentObjectImpl.h",
   "src/libANGLE/renderer/FramebufferImpl.h",
   "src/libANGLE/renderer/GLImplFactory.h",
+  "src/libANGLE/renderer/gl/functionsgl_enums.h",
   "src/libANGLE/renderer/ImageImpl.h",
   "src/libANGLE/renderer/MemoryObjectImpl.h",
   "src/libANGLE/renderer/OverlayImpl.h",