diff --git a/core_settings.gradle b/core_settings.gradle index e2935c9110..15b52a5189 100644 --- a/core_settings.gradle +++ b/core_settings.gradle @@ -21,8 +21,6 @@ if (gradle.ext.has('androidxMediaModulePrefix')) { modulePrefix += gradle.ext.androidxMediaModulePrefix } -rootProject.name = gradle.ext.androidxMediaProjectName - include modulePrefix + 'lib-common' project(modulePrefix + 'lib-common').projectDir = new File(rootDir, 'libraries/common') diff --git a/publish.gradle b/publish.gradle index bd59d32492..57662bb85c 100644 --- a/publish.gradle +++ b/publish.gradle @@ -16,7 +16,7 @@ apply plugin: 'maven-publish' apply from: "$gradle.ext.androidxMediaSettingsDir/missing_aar_type_workaround.gradle" afterEvaluate { - if (rootProject.name == gradle.ext.androidxMediaProjectName) { + if (gradle.ext.has('rootProjectIsAndroidXMedia3') && gradle.ext.rootProjectIsAndroidXMedia3) { publishing { repositories { maven { diff --git a/settings.gradle b/settings.gradle index 9feebe7fce..f1b3347913 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,7 +18,8 @@ if (gradle.ext.has('androidxMediaModulePrefix')) { modulePrefix += gradle.ext.androidxMediaModulePrefix } -gradle.ext.androidxMediaProjectName = 'androidx.media3' +rootProject.name = 'androidx.media3' +gradle.ext.rootProjectIsAndroidXMedia3 = true include modulePrefix + 'demo' project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')