From 8c9c0f8d3f10bb5ac83153099354e1d3260d4848 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 20 May 2021 19:24:23 +0100
Subject: [PATCH] Gradle cleanup #3

Tweak the way directories are passed

PiperOrigin-RevId: 374912886
---
 core_settings.gradle | 1 +
 settings.gradle      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core_settings.gradle b/core_settings.gradle
index 39f7713501..ffee74bccf 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -15,6 +15,7 @@ def rootDir = file(gradle.ext.exoplayerRoot)
 if (!gradle.ext.has('exoplayerSettingsDir')) {
     gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
 }
+
 def modulePrefix = ':'
 if (gradle.ext.has('exoplayerModulePrefix')) {
     modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/settings.gradle b/settings.gradle
index 9c30a54c77..ee651f1908 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,7 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-gradle.ext.exoplayerRoot = settingsDir
+gradle.ext.exoplayerRoot = rootDir
+gradle.ext.exoplayerModulePrefix = ''
 
 def modulePrefix = ':'
 if (gradle.ext.has('exoplayerModulePrefix')) {