[android-platform-tools-base] 15/30: No longer build rule-api.jar or profile.jar: Not used

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Fri Jul 22 10:33:53 UTC 2016


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 77c966e4a5fc2e28b804190335784407c16797c7
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Thu Jul 21 18:47:39 2016 +0800

    No longer build rule-api.jar or profile.jar: Not used
---
 debian/patches/build.gradle.patch | 29 ++++++++++++++++++++---------
 debian/settings.gradle            |  3 ---
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/debian/patches/build.gradle.patch b/debian/patches/build.gradle.patch
index dd6bcf9..5a51e6d 100644
--- a/debian/patches/build.gradle.patch
+++ b/debian/patches/build.gradle.patch
@@ -487,15 +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/rule-api/build.gradle
-+++ b/rule-api/build.gradle
-@@ -1,5 +1,5 @@
- apply plugin: 'java'
--apply plugin: 'sdk-java-lib'
-+
- 
- group = 'com.android.tools'
- archivesBaseName = 'rule-api'
 --- a/sdk-common/build.gradle
 +++ b/sdk-common/build.gradle
 @@ -1,6 +1,5 @@
@@ -612,3 +603,23 @@ Description: Patch upstream's build system for Debian.
 -
 +project.ext.pomDesc = 'Deprecated, use gradle-api'
 \ No newline at end of file
+--- a/common/build.gradle
++++ b/common/build.gradle
+@@ -1,6 +1,5 @@
+ apply plugin: 'java'
+ apply plugin: 'jacoco'
+-apply plugin: 'sdk-java-lib'
+ 
+ dependencies {
+     compile project(':base:annotations')
+@@ -15,8 +14,4 @@
+ version = rootProject.ext.baseVersion
+ 
+ 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"
++project.ext.pomDesc = 'common library used by other Android tools libraries.'
+\ No newline at end of file
diff --git a/debian/settings.gradle b/debian/settings.gradle
index 0396e20..7346570 100644
--- a/debian/settings.gradle
+++ b/debian/settings.gradle
@@ -31,8 +31,6 @@ include ':base:lint-api'
 include ':base:lint-checks'
 include ':base:lint'
 include ':base:manifest-merger'
-include ':base:profile'
-include ':base:rule-api'
 include ':base:repository'
 include ':base:screenshot2'
 include ':base:sdk-common'
@@ -54,6 +52,5 @@ project(':base:lint-api'        ).projectDir = new File(rootDir, 'lint/libs/lint
 project(':base:lint-checks'     ).projectDir = new File(rootDir, 'lint/libs/lint-checks')
 project(':base:lint'            ).projectDir = new File(rootDir, 'lint/cli')
 project(':base:manifest-merger' ).projectDir = new File(rootDir, 'build-system/manifest-merger')
-project(':base:profile'         ).projectDir = new File(rootDir, 'build-system/profile')
 project(':base:screenshot2'     ).projectDir = new File(rootDir, 'misc/screenshot2')
 project(':base:transform-api'   ).projectDir = new File(rootDir, 'build-system/transform-api')
\ No newline at end of file

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



More information about the pkg-java-commits mailing list