Move all support library projects to use a single compilation unit
Also cleans up build files to include annotations as an explicit import,
set compileSdkVersion consistently to currentSdk, and remove unnecessary
lines. Removes obsolete API directories in VDC / AVDC.
Because NotificationCompatBase was using @removed APIs, updated that class
to use reflection. Also fixes method visibility in VDC / AVDC.
Bug: 29630077
Test: make and gradle builds successful
Change-Id: Ia9208246837347ce3d8df4adbe6b0ce406d3844a
diff --git a/v13/build.gradle b/v13/build.gradle
index 4baaa27..5e1a026 100644
--- a/v13/build.gradle
+++ b/v13/build.gradle
@@ -1,33 +1,28 @@
apply plugin: 'com.android.library'
-
archivesBaseName = 'support-v13'
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
+dependencies {
+ compile project(':support-annotations')
+ compile project(':support-v4')
+}
-createApiSourceSets(project, gradle.ext.studioCompat.modules.v13.apiTargets)
-setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.v13.dependencies)
android {
- compileSdkVersion 13
+ compileSdkVersion project.ext.currentSdk
defaultConfig {
minSdkVersion 13
- // TODO: get target from branch
- //targetSdkVersion 19
}
sourceSets {
main.manifest.srcFile 'AndroidManifest.xml'
- main.java.srcDirs = ['java']
- main.aidl.srcDirs = ['java']
-
- androidTest.setRoot('tests')
- androidTest.java.srcDir 'tests/java'
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_7
- targetCompatibility JavaVersion.VERSION_1_7
+ main.java.srcDirs = [
+ 'ics',
+ 'ics-mr1',
+ 'api23',
+ 'api24',
+ 'api25',
+ 'java'
+ ]
}
lintOptions {
@@ -70,11 +65,6 @@
from android.sourceSets.main.java.srcDirs
}
- project.ext.allSS.each { ss ->
- javadocTask.source ss.java
- sourcesJarTask.from ss.java.srcDirs
- }
-
artifacts.add('archives', javadocJarTask);
artifacts.add('archives', sourcesJarTask);
}