Adjust all the needed paths when using upstream repositories

Having a separate 3rdparty_upstream might not be the best solution
after all, but oh well.

Change-Id: Ib834c4d9d56669a3f4308eb614cec787116d6d4c
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

build/gyp_qtwebengine

@@ -11,6 +11,8 @@ if chrome_src:
   chrome_src = os.path.abspath(chrome_src)
 if not chrome_src or not os.path.isdir(chrome_src):
   chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium')
+  if not os.path.isdir(chrome_src):
+    chrome_src = os.path.join(qtwebengine_src, '3rdparty_upstream/chromium')
   print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src
 
 script_dir = os.path.abspath(os.path.join(chrome_src, 'build'))

build/qmake/mkspecs/features/functions.prf

@@ -75,11 +75,16 @@ defineReplace(findNinja) {
   !isEmpty(CACHED_NINJA_EXECUTABLE):exists($$CACHED_NINJA_EXECUTABLE): return($$CACHED_NINJA_EXECUTABLE)
   out = $$which(ninja)
   # Try to be smart about it if we know where the chromium sources are located
-  !exists($$out): out = $$absolute_path("$$QTWEBENGINE_ROOT/3rdparty/ninja/ninja")
-  # If we still did not find ninja, then we bootstrap it.
   !exists($$out) {
-    message("bootstrapping ninja...")
-    system("python $$QTWEBENGINE_ROOT/3rdparty/ninja/bootstrap.py")
+    ninjadir = $$absolute_path("$$QTWEBENGINE_ROOT/3rdparty/ninja")
+    # We might deal with an upstream chromium build
+    !exists($$ninjadir): ninjadir = $$absolute_path("$$QTWEBENGINE_ROOT/3rdparty_upstream/ninja")
+    out = "$$ninjadir/ninja"
+    # If we still did not find ninja, then we bootstrap it.
+    !exists($$out) {
+      message("bootstrapping ninja...")
+      system("python $$ninjadir/bootstrap.py")
+    }
   }
   message("using $$out")
   cache(CACHED_NINJA_EXECUTABLE, set, out)

build/scripts/build_resources.py

@@ -55,6 +55,8 @@ if chrome_src:
   chrome_src = os.path.abspath(chrome_src)
 if not chrome_src or not os.path.isdir(chrome_src):
   chrome_src = os.path.join(qtwebengine_src, '3rdparty/chromium')
+  if not os.path.isdir(chrome_src):
+    chrome_src = os.path.join(qtwebengine_src, '3rdparty_upstream/chromium')
   print 'CHROMIUM_SRC_DIR not set, falling back to ' + chrome_src
 
 grit_tool = os.path.join(chrome_src, 'tools/grit/grit.py')