mirror of
https://github.com/androidx/media.git
synced 2025-05-07 23:50:44 +08:00
Merge pull request #34 from h6ah4i:fix/referring-duplicated-module-prefixed-project
PiperOrigin-RevId: 425858281
This commit is contained in:
commit
85c07be93c
@ -17,9 +17,10 @@ apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
|
|||||||
// the Gradle properties of each library are populated and we can automatically
|
// the Gradle properties of each library are populated and we can automatically
|
||||||
// check if a 'releaseArtifactId' exists.
|
// check if a 'releaseArtifactId' exists.
|
||||||
rootProject.allprojects.forEach {
|
rootProject.allprojects.forEach {
|
||||||
if ((it.name.contains('lib-') || it.name.contains('test-'))
|
if ((it.name.startsWith(modulePrefix.replace(':', '') + 'lib-')
|
||||||
|
|| it.name.startsWith(modulePrefix.replace(':', '') + 'test-'))
|
||||||
&& !it.name.endsWith('-common')) {
|
&& !it.name.endsWith('-common')) {
|
||||||
evaluationDependsOn(modulePrefix + it.name)
|
evaluationDependsOn(':' + it.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// copybara:media3-only
|
// copybara:media3-only
|
||||||
@ -36,8 +37,9 @@ dependencies {
|
|||||||
// List all released targets as constraints. This ensures they are all
|
// List all released targets as constraints. This ensures they are all
|
||||||
// resolved to the same version.
|
// resolved to the same version.
|
||||||
rootProject.allprojects.forEach {
|
rootProject.allprojects.forEach {
|
||||||
if (it.hasProperty('releaseArtifactId')) {
|
if (it.hasProperty('releaseArtifactId')
|
||||||
implementation project(modulePrefix + it.name)
|
&& it.releaseArtifactId.startsWith('media3-')) {
|
||||||
|
implementation project(':' + it.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user