Bug 1880746 - Part 2: Simplify angle moz.build DIRS dependencies. r=firefox-build-system-reviewers,jgilbert,glandium

Differential Revision: https://phabricator.services.mozilla.com/D202206

gfx/angle/moz.build

@@ -4,7 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ["targets/translator"]
+DIRS += [
+    "targets/angle_common",
+    "targets/translator",
+]
 
 # Only build libEGL/libGLESv2 on Windows
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":

gfx/angle/targets/angle_gpu_info_util/moz.build

@@ -170,10 +170,6 @@ USE_LIBS += [
     "angle_common",
 ]
 
-DIRS += [
-    "../angle_common",
-]
-
 OS_LIBS += [
     "dxgi",
     "setupapi",

gfx/angle/targets/angle_image_util/moz.build

@@ -150,10 +150,6 @@ USE_LIBS += [
     "angle_common",
 ]
 
-DIRS += [
-    "../angle_common",
-]
-
 # LDFLAGS += [
 #     "--color-diagnostics",
 #     "/call-graph-profile-sort:no",

gfx/angle/targets/libEGL/moz.build

@@ -157,11 +157,6 @@ USE_LIBS += [
     "libGLESv2",
 ]
 
-DIRS += [
-    "../angle_common",
-    "../libGLESv2",
-]
-
 OS_LIBS += [
     "advapi32",
     "comdlg32",

gfx/angle/targets/libGLESv2/moz.build

@@ -366,11 +366,9 @@ USE_LIBS += [
 ]
 
 DIRS += [
-    "../angle_common",
     "../angle_gpu_info_util",
     "../angle_image_util",
     "../compression_utils_portable",
-    "../translator",
 ]
 
 OS_LIBS += [

gfx/angle/targets/preprocessor/moz.build

@@ -156,10 +156,6 @@ USE_LIBS += [
     "angle_common",
 ]
 
-DIRS += [
-    "../angle_common",
-]
-
 # LDFLAGS += [
 #     "--color-diagnostics",
 #     "/call-graph-profile-sort:no",

gfx/angle/targets/translator/moz.build

@@ -298,7 +298,6 @@ USE_LIBS += [
 ]
 
 DIRS += [
-    "../angle_common",
     "../preprocessor",
 ]
 

gfx/angle/update-angle.py

@@ -502,8 +502,18 @@ def export_target(target_full_name) -> Set[str]:
     dep_dirs = set(dep_libs)
     dep_dirs.discard("zlib")
 
+    # Those directories are added by gfx/angle/moz.build.
+    already_added_dirs = [
+        "angle_common",
+        "translator",
+        "libEGL",
+        "libGLESv2",
+    ]
+
     append_arr(lines, "USE_LIBS", dep_libs)
-    append_arr(lines, "DIRS", ["../" + x for x in dep_dirs])
+    append_arr(
+        lines, "DIRS", ["../" + x for x in dep_dirs if x not in already_added_dirs]
+    )
     append_arr(lines, "OS_LIBS", os_libs)
     append_arr_commented(lines, "LDFLAGS", ldflags)