Skip to content

Commit

Permalink
Remove a copybara stripping tag
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 530935437
(cherry picked from commit be9bc32)
  • Loading branch information
icbaker committed May 15, 2023
1 parent 3b862ed commit dce9fe4
Show file tree
Hide file tree
Showing 38 changed files with 117 additions and 117 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ allprojects {
}
buildDir = "${externalBuildDir}/${project.name}"
}
group = 'com.google.android.exoplayer'
group = 'com.google.android.exoplayer'
}

apply from: 'javadoc_combined.gradle'
2 changes: 1 addition & 1 deletion common_library_config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
apply plugin: 'com.android.library'

android {
Expand Down
12 changes: 6 additions & 6 deletions constants.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
project.ext {
// ExoPlayer version and version code.
releaseVersion = '2.18.6'
releaseVersionCode = 2_018_006
// ExoPlayer version and version code.
releaseVersion = '2.18.6'
releaseVersionCode = 2_018_006
minSdkVersion = 16
appTargetSdkVersion = 33
// API version before restricting local file access.
Expand Down Expand Up @@ -57,7 +57,7 @@ project.ext {
truthVersion = '1.1.3'
okhttpVersion = '4.9.2'
modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
}
12 changes: 6 additions & 6 deletions core_settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
def rootDir = file(".")
if (!gradle.ext.has('exoplayerSettingsDir')) {
gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
}
if (!gradle.ext.has('exoplayerSettingsDir')) {
gradle.ext.exoplayerSettingsDir = rootDir.getCanonicalPath()
}

def modulePrefix = ':'
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}
if (gradle.ext.has('exoplayerModulePrefix')) {
modulePrefix += gradle.ext.exoplayerModulePrefix
}

include modulePrefix + 'library-common'
project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common')
Expand Down
2 changes: 1 addition & 1 deletion extensions/av1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
defaultConfig {
Expand Down
6 changes: 3 additions & 3 deletions extensions/cast/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
api 'com.google.android.gms:play-services-cast-framework:21.2.0'
Expand All @@ -30,7 +30,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-cast'
releaseDescription = 'Cast extension for ExoPlayer.'
releaseArtifactId = 'extension-cast'
releaseDescription = 'Cast extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
6 changes: 3 additions & 3 deletions extensions/cronet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
defaultConfig {
Expand Down Expand Up @@ -46,7 +46,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-cronet'
releaseDescription = 'Cronet extension for ExoPlayer.'
releaseArtifactId = 'extension-cronet'
releaseDescription = 'Cronet extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
2 changes: 1 addition & 1 deletion extensions/ffmpeg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

// Configure the native build only if ffmpeg is present to avoid gradle sync
// failures if ffmpeg hasn't been built according to the README instructions.
Expand Down
4 changes: 2 additions & 2 deletions extensions/flac/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
defaultConfig {
Expand All @@ -22,7 +22,7 @@ android {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}

Expand Down
8 changes: 4 additions & 4 deletions extensions/ima/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
defaultConfig {
Expand All @@ -20,7 +20,7 @@ android {
}

sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}

Expand All @@ -46,7 +46,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-ima'
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
releaseArtifactId = 'extension-ima'
releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
6 changes: 3 additions & 3 deletions extensions/leanback/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android.defaultConfig.minSdkVersion 17

Expand All @@ -28,7 +28,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-leanback'
releaseDescription = 'Leanback extension for ExoPlayer.'
releaseArtifactId = 'extension-leanback'
releaseDescription = 'Leanback extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
2 changes: 1 addition & 1 deletion extensions/media2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
implementation project(modulePrefix + 'library-common')
Expand Down
2 changes: 1 addition & 1 deletion extensions/mediasession/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
implementation project(modulePrefix + 'library-common')
Expand Down
6 changes: 3 additions & 3 deletions extensions/okhttp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android.defaultConfig.minSdkVersion 21

Expand All @@ -34,7 +34,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-okhttp'
releaseDescription = 'OkHttp extension for ExoPlayer.'
releaseArtifactId = 'extension-okhttp'
releaseDescription = 'OkHttp extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
4 changes: 2 additions & 2 deletions extensions/opus/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
sourceSets {
main {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}

Expand Down
6 changes: 3 additions & 3 deletions extensions/rtmp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
implementation project(modulePrefix + 'library-common')
Expand All @@ -31,7 +31,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-rtmp'
releaseDescription = 'RTMP extension for ExoPlayer.'
releaseArtifactId = 'extension-rtmp'
releaseDescription = 'RTMP extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
4 changes: 2 additions & 2 deletions extensions/vp9/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
sourceSets {
main {
jniLibs.srcDir 'src/main/libs'
jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
}
androidTest.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
}
}

Expand Down
6 changes: 3 additions & 3 deletions extensions/workmanager/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
implementation project(modulePrefix + 'library-core')
Expand All @@ -27,7 +27,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'extension-workmanager'
releaseDescription = 'WorkManager extension for ExoPlayer.'
releaseArtifactId = 'extension-workmanager'
releaseDescription = 'WorkManager extension for ExoPlayer.'
}
apply from: '../../publish.gradle'
2 changes: 1 addition & 1 deletion library/all/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

dependencies {
api project(modulePrefix + 'library-common')
Expand Down
6 changes: 3 additions & 3 deletions library/common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
buildTypes {
Expand Down Expand Up @@ -63,7 +63,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'exoplayer-common'
releaseDescription = 'The ExoPlayer library common module.'
releaseArtifactId = 'exoplayer-common'
releaseDescription = 'The ExoPlayer library common module.'
}
apply from: '../../publish.gradle'
10 changes: 5 additions & 5 deletions library/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
defaultConfig {
Expand All @@ -33,8 +33,8 @@ android {
}

sourceSets {
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
androidTest.assets.srcDir '../../testdata/src/test/assets/'
test.assets.srcDir '../../testdata/src/test/assets/'
}
}

Expand Down Expand Up @@ -72,7 +72,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'exoplayer-core'
releaseDescription = 'The ExoPlayer library core module.'
releaseArtifactId = 'exoplayer-core'
releaseDescription = 'The ExoPlayer library core module.'
}
apply from: '../../publish.gradle'
8 changes: 4 additions & 4 deletions library/dash/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
buildTypes {
Expand All @@ -20,7 +20,7 @@ android {
}
}

sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
sourceSets.test.assets.srcDir '../../testdata/src/test/assets/'
}

dependencies {
Expand All @@ -41,7 +41,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'exoplayer-dash'
releaseDescription = 'The ExoPlayer library DASH module.'
releaseArtifactId = 'exoplayer-dash'
releaseDescription = 'The ExoPlayer library DASH module.'
}
apply from: '../../publish.gradle'
6 changes: 3 additions & 3 deletions library/database/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// 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.
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"

android {
buildTypes {
Expand All @@ -38,7 +38,7 @@ ext {
apply from: '../../javadoc_library.gradle'

ext {
releaseArtifactId = 'exoplayer-database'
releaseDescription = 'The ExoPlayer database module.'
releaseArtifactId = 'exoplayer-database'
releaseDescription = 'The ExoPlayer database module.'
}
apply from: '../../publish.gradle'

0 comments on commit dce9fe4

Please sign in to comment.