aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorPietro F. Maggi <pmaggi@google.com>2019-01-10 20:26:34 +0000
committerPietro F. Maggi <pmaggi@google.com>2019-01-10 21:06:40 +0000
commit283d419fa171fbfe29f758e3ae930390a62ab3e2 (patch)
treed6f9a847ac8425dae963c80f1a578746618eded0 /system
parentf6809f75a2b397a6bfa90e9246e92f4993aaa155 (diff)
downloadandroid-283d419fa171fbfe29f758e3ae930390a62ab3e2.tar.gz
Fixed grandle.build
- added google() repo - removed jack options - bump version - Fixed AndroidManifest.xml Bug: 122662804 Test: Built Locally Change-Id: Iabfe91d7abe9349d52a5ba667d1e3b61736b4664
Diffstat (limited to 'system')
-rw-r--r--system/AppShortcuts/app/build.gradle8
-rw-r--r--system/AppShortcuts/app/src/main/AndroidManifest.xml2
-rw-r--r--system/AppShortcuts/build.gradle4
-rw-r--r--system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties2
4 files changed, 6 insertions, 10 deletions
diff --git a/system/AppShortcuts/app/build.gradle b/system/AppShortcuts/app/build.gradle
index 68dc6a7e..26ebd8e7 100644
--- a/system/AppShortcuts/app/build.gradle
+++ b/system/AppShortcuts/app/build.gradle
@@ -1,16 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 25
- buildToolsVersion "25.0.0"
+ compileSdkVersion 28
defaultConfig {
applicationId "com.example.android.shortcutsample"
minSdkVersion 25
- targetSdkVersion 25
- jackOptions {
- enabled true
- }
+ targetSdkVersion 28
}
compileOptions {
diff --git a/system/AppShortcuts/app/src/main/AndroidManifest.xml b/system/AppShortcuts/app/src/main/AndroidManifest.xml
index 183bc84d..da4c0748 100644
--- a/system/AppShortcuts/app/src/main/AndroidManifest.xml
+++ b/system/AppShortcuts/app/src/main/AndroidManifest.xml
@@ -17,8 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.appshortcuts">
- <uses-sdk android:minSdkVersion="25" />
-
<uses-permission android:name="android.permission.INTERNET" />
<application
diff --git a/system/AppShortcuts/build.gradle b/system/AppShortcuts/build.gradle
index ef4eaec6..244379a1 100644
--- a/system/AppShortcuts/build.gradle
+++ b/system/AppShortcuts/build.gradle
@@ -1,15 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
+ google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.0'
+ classpath 'com.android.tools.build:gradle:3.2.1'
}
}
allprojects {
repositories {
+ google()
jcenter()
}
}
diff --git a/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties b/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
index ce4e724f..4dc91dd5 100644
--- a/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
+++ b/system/AppShortcuts/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip \ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip