Remove a few hardcoded path to libjpeg_turbo

build_overrides/angle.gni

@@ -11,8 +11,8 @@ angle_has_build = true
 # Overrides for ANGLE's dependencies
 angle_glslang_dir = "//third_party/glslang/src"
 angle_googletest_dir = "//third_party/googletest/src"
-angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
 angle_jsoncpp_dir = "//third_party/jsoncpp"
+angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
 angle_libpng_dir = "//third_party/libpng"
 angle_spirv_cross_dir = "//third_party/spirv-cross/src"
 angle_spirv_headers_dir = "//third_party/spirv-headers/src"

third_party/BUILD.gn

@@ -5,10 +5,16 @@
 # See:
 # https://chromium.googlesource.com/chromium/src/+/master/third_party/BUILD.gn
 
+import("//build_overrides/angle.gni")
 import("//third_party/libjpeg.gni")
 
 assert(!is_ios, "This is not used on iOS, don't drag it in unintentionally")
 
+# TODO(jiajie.hu@intel.com): Define the override in Chromium and remove this.
+if (!defined(angle_libjpeg_turbo_dir)) {
+  angle_libjpeg_turbo_dir = "//third_party/libjpeg_turbo"
+}
+
 config("system_libjpeg_config") {
   libs = [ "jpeg" ]
   defines = [ "USE_SYSTEM_LIBJPEG" ]
@@ -25,7 +31,7 @@ group("jpeg") {
   if (use_system_libjpeg) {
     public_configs = [ ":system_libjpeg_config" ]
   } else if (use_libjpeg_turbo) {
-    public_deps = [ "//third_party/libjpeg_turbo:libjpeg" ]
+    public_deps = [ "$angle_libjpeg_turbo_dir:libjpeg" ]
     public_configs = [ ":libjpeg_turbo_config" ]
   } else {
     public_deps = [ "//third_party/libjpeg:libjpeg" ]
@@ -40,7 +46,7 @@ group("jpeg_includes") {
   if (use_system_libjpeg) {
     public_configs = [ ":system_libjpeg_config" ]
   } else if (use_libjpeg_turbo) {
-    public_configs = [ "//third_party/libjpeg_turbo:libjpeg_config" ]
+    public_configs = [ "$angle_libjpeg_turbo_dir:libjpeg_config" ]
   } else {
     public_configs = [ "//third_party/libjpeg:libjpeg_config" ]
   }