From 23b9a410591608f1166910a7da765c4155f898c4 Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Thu, 15 Aug 2019 14:33:40 -0700
Subject: [PATCH] Consume new `substitute-local-geckoview.gradle` script from
 Bug 1533465.

---
 app/build.gradle | 8 ++++++++
 settings.gradle  | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index f5d97d2ba..c6ba37150 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -582,3 +582,11 @@ afterEvaluate {
         }
     }
 }
+
+if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcdir')) {
+    if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopobjdir')) {
+        ext.topobjdir = gradle."localProperties.dependencySubstitutions.geckoviewTopobjdir"
+    }
+    ext.topsrcdir = gradle."localProperties.dependencySubstitutions.geckoviewTopsrcdir"
+    apply from: "${topsrcdir}/substitute-local-geckoview.gradle"
+}
diff --git a/settings.gradle b/settings.gradle
index 277623896..730a05be1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,6 +16,10 @@ if (file('local.properties').canRead()) {
 }
 
 if (localProperties != null) {
+    localProperties.each { prop ->
+        gradle.ext.set("localProperties.${prop.key}", prop.value)
+    }
+
     String appServicesLocalPath = localProperties.getProperty(settingAppServicesPath);
 
     if (appServicesLocalPath != null) {