[android-platform-tools-base] 14/30: No longer build ninpatch.jar: Not used

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository android-platform-tools-base.

commit 6ee97bf6182c9fe5840626468b23601a7461403f
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jul 21 18:04:34 2016 +0800

    No longer build ninpatch.jar: Not used
---
 debian/patches/build.gradle.patch     | 113 ----------------------------------
 debian/patches/project-test-lib.patch |   5 +-
 debian/settings.gradle                |   1 -
 3 files changed, 2 insertions(+), 117 deletions(-)

diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index 4777209..dd6bcf9 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -226,29 +226,6 @@ Description: Patch upstream's build system for Debian.
  jar.manifest.attributes("Plugin-Version": version)
  jar.manifest.attributes("Inception-Date":"${Calendar.getInstance().get(Calendar.YEAR)}:" +
          "${Calendar.getInstance().get(Calendar.MONTH)}:${Calendar.getInstance().get(Calendar.DATE)}")
---- a/build-system/integration-test/build.gradle
-+++ b/build-system/integration-test/build.gradle
-@@ -1,5 +1,4 @@
- apply plugin: 'groovy'
--apply plugin: 'jacoco'
- 
- repositories {
-     maven { url = uri(rootProject.cloneArtifacts.repository) }
---- a/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
-+++ b/build-system/integration-test/test-projects/3rdPartyTests/buildSrc/build.gradle
-@@ -1,5 +1,4 @@
- apply plugin: 'java'
--apply plugin: 'idea'
- 
- def env = new Object() {
-     String gradleVersion
-@@ -11,4 +10,4 @@
- 
- dependencies {
-     compile "com.android.tools.build:builder-test-api:$env.gradleVersion"
--}
-\ No newline at end of file
-+}
 --- a/build-system/manifest-merger/build.gradle
 +++ b/build-system/manifest-merger/build.gradle
 @@ -1,6 +1,6 @@
@@ -267,48 +244,6 @@ Description: Patch upstream's build system for Debian.
 -apply from: "$rootDir/buildSrc/base/bintray.gradle"
 -apply from: "$rootDir/buildSrc/base/javadoc.gradle"
  
---- a/build-system/project-test-lib/build.gradle
-+++ b/build-system/project-test-lib/build.gradle
-@@ -1,6 +1,4 @@
- apply plugin: 'java'
--apply plugin: 'clone-artifacts'
--apply plugin: 'idea'
- 
- def toolingApiVersion = gradle.gradleVersion
- dependencies {
---- a/build-system/project-test/build.gradle
-+++ b/build-system/project-test/build.gradle
-@@ -1,6 +1,4 @@
- apply plugin: 'java'
--apply plugin: 'clone-artifacts'
--apply plugin: 'idea'
- apply plugin: 'application'
- 
- dependencies {
---- a/chartlib/build.gradle
-+++ b/chartlib/build.gradle
-@@ -14,4 +14,3 @@
- project.ext.pomName = 'Android Tools chartlib'
- project.ext.pomDesc = 'Library with Swing chart widgets'
- 
--apply from: "$rootDir/buildSrc/base/javadoc.gradle"
---- a/common/build.gradle
-+++ b/common/build.gradle
-@@ -1,6 +1,6 @@
- apply plugin: 'java'
- apply plugin: 'jacoco'
--apply plugin: 'sdk-java-lib'
-+
- 
- dependencies {
-     compile project(':base:annotations')
-@@ -17,6 +17,3 @@
- project.ext.pomName = 'Android Tools common library'
- project.ext.pomDesc = 'common library used by other Android tools libraries.'
- 
--apply from: "$rootDir/buildSrc/base/publish.gradle"
--apply from: "$rootDir/buildSrc/base/bintray.gradle"
--apply from: "$rootDir/buildSrc/base/javadoc.gradle"
 --- a/ddmlib/build.gradle
 +++ b/ddmlib/build.gradle
 @@ -1,6 +1,6 @@
@@ -528,16 +463,6 @@ Description: Patch upstream's build system for Debian.
 -apply from: "$rootDir/buildSrc/base/bintray.gradle"
 -apply from: "$rootDir/buildSrc/base/javadoc.gradle"
  
---- a/lint/libs/lint-tests/build.gradle
-+++ b/lint/libs/lint-tests/build.gradle
-@@ -24,7 +24,4 @@
- project.ext.pomName = 'Android Tools Lint Test API'
- project.ext.pomDesc = 'API to build lint check tests'
- 
--apply from: "$rootDir/buildSrc/base/publish.gradle"
--apply from: "$rootDir/buildSrc/base/bintray.gradle"
--apply from: "$rootDir/buildSrc/base/javadoc.gradle"
- 
 --- a/misc/screenshot2/build.gradle
 +++ b/misc/screenshot2/build.gradle
 @@ -1,5 +1,5 @@
@@ -562,30 +487,6 @@ Description: Patch upstream's build system for Debian.
 -
 -// configure the manifest of the sdkJar task.
 -sdkJar.manifest.attributes("Main-Class": "com.android.screenshot.Screenshot")
---- a/ninepatch/build.gradle
-+++ b/ninepatch/build.gradle
-@@ -1,6 +1,6 @@
- apply plugin: 'java'
- apply plugin: 'jacoco'
--apply plugin: 'sdk-java-lib'
-+
- 
- group = 'com.android.tools'
- archivesBaseName = 'ninepatch'
---- a/perflib/build.gradle
-+++ b/perflib/build.gradle
-@@ -17,4 +17,3 @@
- project.ext.pomName = 'Android Tools perflib'
- project.ext.pomDesc = 'Library to handle android performance data'
- 
--apply from: "$rootDir/buildSrc/base/javadoc.gradle"
---- a/rpclib/build.gradle
-+++ b/rpclib/build.gradle
-@@ -13,4 +13,3 @@
- project.ext.pomName = 'Android Tools rpclib'
- project.ext.pomDesc = 'Library to handle Gaze RPC'
- 
--apply from: "$rootDir/buildSrc/base/javadoc.gradle"
 --- a/rule-api/build.gradle
 +++ b/rule-api/build.gradle
 @@ -1,5 +1,5 @@
@@ -612,20 +513,6 @@ Description: Patch upstream's build system for Debian.
 -apply from: "$rootDir/buildSrc/base/bintray.gradle"
 -apply from: "$rootDir/buildSrc/base/javadoc.gradle"
  
---- a/sdk-common/generate-locale-data/build.gradle
-+++ b/sdk-common/generate-locale-data/build.gradle
-@@ -1,5 +1,5 @@
- apply plugin: 'java'
--apply plugin: 'sdk-java-lib'
-+
- 
- dependencies {
-     compile project(':base:sdk-common')
-@@ -10,4 +10,3 @@
- group = 'com.android.tools'
- archivesBaseName = 'generate-locale-data'
- version = rootProject.ext.baseVersion
--sdkJar.manifest.attributes("Main-Class": "com.android.ide.common.generate.locale.LocaleTableGenerator")
 --- a/sdklib/build.gradle
 +++ b/sdklib/build.gradle
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/project-test-lib.patch b/debian/patches/project-test-lib.patch
index 62463c4..3953023 100644
--- a/debian/patches/project-test-lib.patch
+++ b/debian/patches/project-test-lib.patch
@@ -9,7 +9,7 @@ Subject: project-test-lib
 
 --- a/build-system/gradle-core/build.gradle
 +++ b/build-system/gradle-core/build.gradle
-@@ -54,7 +54,6 @@
+@@ -56,7 +56,6 @@
      testCompile 'com.google.truth:truth:0.28'
      testCompile 'org.mockito:mockito-all:1.9.5'
      testCompile 'com.google.guava:guava:17.0'
@@ -19,12 +19,11 @@ Subject: project-test-lib
  
 --- a/build-system/gradle/build.gradle
 +++ b/build-system/gradle/build.gradle
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,6 @@
      compile gradleApi()
  
      testCompile 'junit:junit:4.12'
 -    testCompile project(':base:project-test-lib')
-+    //testCompile project(':base:project-test-lib')
  }
  
  group = 'com.android.tools.build'
diff --git a/debian/settings.gradle b/debian/settings.gradle
index 73e0215..0396e20 100644
--- a/debian/settings.gradle
+++ b/debian/settings.gradle
@@ -31,7 +31,6 @@ include ':base:lint-api'
 include ':base:lint-checks'
 include ':base:lint'
 include ':base:manifest-merger'
-include ':base:ninepatch'
 include ':base:profile'
 include ':base:rule-api'
 include ':base:repository'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/android-platform-tools-base.git