diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-08-25 22:21:40 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-08-25 22:23:06 -0700 |
commit | 4a4b49ff3482cbe7f8192807cdc99437810fe518 (patch) | |
tree | 29f5bbdd392348108f040a208c4af37ed34e3e92 /build.gradle | |
parent | bb248828fcfa5def88d1180c590249b82d478b0b (diff) | |
download | android_packages_apps_Trebuchet-4a4b49ff3482cbe7f8192807cdc99437810fe518.tar.gz android_packages_apps_Trebuchet-4a4b49ff3482cbe7f8192807cdc99437810fe518.tar.bz2 android_packages_apps_Trebuchet-4a4b49ff3482cbe7f8192807cdc99437810fe518.zip |
Fixing wrong label in the AndroidManifest
Updating the gradle and protobuf library version
Change-Id: I0470ebe7465cf2f04ef59688ac2b3f4933d48ad1
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index ffe445522..e103d792f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' - classpath 'com.google.protobuf:protobuf-gradle-plugin:0.7.0' + classpath 'com.android.tools.build:gradle:2.1.3' + classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0' } } @@ -16,13 +16,11 @@ android { buildToolsVersion '24.0.0' defaultConfig { - applicationId "com.android.launcher3" minSdkVersion 21 - targetSdkVersion 'N' + targetSdkVersion 25 versionCode 1 versionName "1.0" - testApplicationId "com.android.launcher3.tests" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -30,11 +28,18 @@ android { minifyEnabled false } } + + productFlavors { + aosp { + applicationId 'com.android.launcher3' + testApplicationId 'com.android.launcher3.tests' + } + } sourceSets { main { res.srcDirs = ['res'] java.srcDirs = ['src', 'src_config'] - manifest.srcFile 'AndroidManifest.xml' + manifest.srcFile 'AndroidManifest-common.xml' proto.srcDirs 'protos/' } @@ -42,6 +47,10 @@ android { java.srcDirs = ['tests/src'] manifest.srcFile "tests/AndroidManifest.xml" } + + aosp { + manifest.srcFile "AndroidManifest.xml" + } } } @@ -65,5 +74,16 @@ protobuf { // Configure the protoc executable protoc { artifact = 'com.google.protobuf:protoc:3.0.0-alpha-3' + + generateProtoTasks { + all().each { task -> + task.builtins { + remove java + javanano { + option 'ignore_services=false' + } + } + } + } } } |