From a3977b94be588598d10acf6c1ab59444c1c3ef3d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 30 Jun 2020 18:04:25 +0100
Subject: [PATCH] Fix import of settings file for relative ExoPlayer paths.

Including ExoPlayer via relative paths currently breaks the import
logic of the common library settings file because it's referenced
from different directories. Fix this by resolving the setting path
to its canonical name.

Issue: #7554
PiperOrigin-RevId: 319043560
---
 common_library_config.gradle | 2 +-
 core_settings.gradle         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common_library_config.gradle b/common_library_config.gradle
index 7be2290bc0..431a7ab14d 100644
--- a/common_library_config.gradle
+++ b/common_library_config.gradle
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-apply from: "$gradle.ext.exoplayerRoot/constants.gradle"
+apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
 apply plugin: 'com.android.library'
 
 android {
diff --git a/core_settings.gradle b/core_settings.gradle
index 3672b015ca..6ed89e40cb 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -13,7 +13,7 @@
 // limitations under the License.
 def rootDir = gradle.ext.exoplayerRoot
 if (!gradle.ext.has('exoplayerSettingsDir')) {
-    gradle.ext.exoplayerSettingsDir = rootDir
+    gradle.ext.exoplayerSettingsDir = new File(rootDir).getCanonicalPath()
 }
 def modulePrefix = ':'
 if (gradle.ext.has('exoplayerModulePrefix')) {