Gradle cleanup #1

Colocate lines that refer to the same module, to reduce probability of
accidentally removing one line and not the other (which has happened
more than once :)).

PiperOrigin-RevId: 374847082

core_settings.gradle

@@ -21,59 +21,60 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 }
 
 include modulePrefix + 'library'
+project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
 include modulePrefix + 'library-common'
+project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common')
 include modulePrefix + 'library-core'
+project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
 include modulePrefix + 'library-dash'
+project(modulePrefix + 'library-dash').projectDir = new File(rootDir, 'library/dash')
 include modulePrefix + 'library-extractor'
+project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'library/extractor')
 include modulePrefix + 'library-hls'
+project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hls')
 include modulePrefix + 'library-rtsp'
+project(modulePrefix + 'library-rtsp').projectDir = new File(rootDir, 'library/rtsp')
 include modulePrefix + 'library-smoothstreaming'
+project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
 include modulePrefix + 'library-transformer'
+project(modulePrefix + 'library-transformer').projectDir = new File(rootDir, 'library/transformer')
 include modulePrefix + 'library-ui'
-include modulePrefix + 'robolectricutils'
-include modulePrefix + 'testutils'
-include modulePrefix + 'testdata'
+project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
+
 include modulePrefix + 'extension-av1'
+project(modulePrefix + 'extension-av1').projectDir = new File(rootDir, 'extensions/av1')
 include modulePrefix + 'extension-ffmpeg'
+project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
 include modulePrefix + 'extension-flac'
+project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 include modulePrefix + 'extension-gvr'
+project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
 include modulePrefix + 'extension-ima'
+project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
 include modulePrefix + 'extension-cast'
+project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 include modulePrefix + 'extension-cronet'
+project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
 include modulePrefix + 'extension-mediasession'
+project(modulePrefix + 'extension-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
 include modulePrefix + 'extension-media2'
+project(modulePrefix + 'extension-media2').projectDir = new File(rootDir, 'extensions/media2')
 include modulePrefix + 'extension-okhttp'
+project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 include modulePrefix + 'extension-opus'
+project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
 include modulePrefix + 'extension-vp9'
+project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
 include modulePrefix + 'extension-rtmp'
+project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
 include modulePrefix + 'extension-leanback'
+project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
 include modulePrefix + 'extension-workmanager'
+project(modulePrefix + 'extension-workmanager').projectDir = new File(rootDir, 'extensions/workmanager')
 
-project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
-project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common')
-project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
-project(modulePrefix + 'library-dash').projectDir = new File(rootDir, 'library/dash')
-project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'library/extractor')
-project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hls')
-project(modulePrefix + 'library-rtsp').projectDir = new File(rootDir, 'library/rtsp')
-project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
-project(modulePrefix + 'library-transformer').projectDir = new File(rootDir, 'library/transformer')
-project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
+include modulePrefix + 'robolectricutils'
 project(modulePrefix + 'robolectricutils').projectDir = new File(rootDir, 'robolectricutils')
+include modulePrefix + 'testutils'
 project(modulePrefix + 'testutils').projectDir = new File(rootDir, 'testutils')
+include modulePrefix + 'testdata'
 project(modulePrefix + 'testdata').projectDir = new File(rootDir, 'testdata')
-project(modulePrefix + 'extension-av1').projectDir = new File(rootDir, 'extensions/av1')
-project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
-project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
-project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
-project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
-project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
-project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
-project(modulePrefix + 'extension-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
-project(modulePrefix + 'extension-media2').projectDir = new File(rootDir, 'extensions/media2')
-project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
-project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
-project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
-project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
-project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
-project(modulePrefix + 'extension-workmanager').projectDir = new File(rootDir, 'extensions/workmanager')

settings.gradle

@@ -19,14 +19,15 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 }
 
 include modulePrefix + 'demo'
-include modulePrefix + 'demo-cast'
-include modulePrefix + 'demo-gl'
-include modulePrefix + 'demo-surface'
-include modulePrefix + 'playbacktests'
 project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
+include modulePrefix + 'demo-cast'
 project(modulePrefix + 'demo-cast').projectDir = new File(rootDir, 'demos/cast')
+include modulePrefix + 'demo-gl'
 project(modulePrefix + 'demo-gl').projectDir = new File(rootDir, 'demos/gl')
+include modulePrefix + 'demo-surface'
 project(modulePrefix + 'demo-surface').projectDir = new File(rootDir, 'demos/surface')
+
+include modulePrefix + 'playbacktests'
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 
 apply from: 'core_settings.gradle'