diff options
| -rw-r--r-- | bash_completion/adb.bash | 2 | ||||
| -rw-r--r-- | eclipse/build.gradle | 14 | ||||
| -rw-r--r-- | files/proguard-android-optimize.txt | 4 | ||||
| -rw-r--r-- | files/proguard-android.txt | 4 |
4 files changed, 15 insertions, 9 deletions
diff --git a/bash_completion/adb.bash b/bash_completion/adb.bash index c1793d9e1..397de8e4b 100644 --- a/bash_completion/adb.bash +++ b/bash_completion/adb.bash @@ -43,9 +43,7 @@ _adb() { *) if [[ $where == OPT_SERIAL ]]; then where=OPT_SERIAL_ARG - elif [[ $where == OPT_SERIAL_ARG ]]; then serial=${cur} - where=OPTIONS else where=COMMAND break diff --git a/eclipse/build.gradle b/eclipse/build.gradle index c483ce7ab..5624821f4 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -8,9 +8,17 @@ // get tools/base version apply from: "../../tools/buildSrc/base/version.gradle" +ext.outPath = System.env.OUT_DIR +if (outPath != null) { + ext.outFile = new File(outPath) +} else { + outPath = '../../out' + ext.outFile = new File(projectDir, outPath) +} + repositories { maven { url '../../prebuilts/tools/common/m2/repository' } - maven { url '../../out/repo' } + maven { url outPath + '/repo' } } ext { @@ -132,7 +140,7 @@ task copydeps << { // unzip eclipse prebuilts into the out folder to create a target platform for the build task unzipTargetPlatform << { - File targetDir = new File(projectDir, "../../out/host/maven/target").getCanonicalFile() + File targetDir = new File(outFile, "/host/maven/target").getCanonicalFile() targetDir.mkdirs() project.targetComponents.each { String k, File v -> @@ -144,7 +152,7 @@ task unzipTargetPlatform << { task buildEclipse(type: Exec, dependsOn: unzipTargetPlatform) { def maven = new File(projectDir, "../../prebuilts/eclipse/maven/apache-maven-3.2.1/bin/mvn").getCanonicalFile() - def androidOut = new File(projectDir, "../../out").getCanonicalPath() + def androidOut = outFile.getCanonicalPath() environment("M2_HOME", maven.getParentFile().getParentFile().getCanonicalPath()) workingDir projectDir commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=$project.buildNumber", "-DANDROID_OUT=$androidOut", "package" diff --git a/files/proguard-android-optimize.txt b/files/proguard-android-optimize.txt index f8f5bcbc7..3e671f7a6 100644 --- a/files/proguard-android-optimize.txt +++ b/files/proguard-android-optimize.txt @@ -50,8 +50,8 @@ public static ** valueOf(java.lang.String); } --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; +-keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator CREATOR; } -keepclassmembers class **.R$* { diff --git a/files/proguard-android.txt b/files/proguard-android.txt index fe73baeb5..5f254934d 100644 --- a/files/proguard-android.txt +++ b/files/proguard-android.txt @@ -43,8 +43,8 @@ public static ** valueOf(java.lang.String); } --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; +-keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator CREATOR; } -keepclassmembers class **.R$* { |