[android-platform-tools-base] 01/01: Move sdk-common, lint, asset-studio to libgradle-android-plugin-java as they have dependencies on each other

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Sat Aug 6 09:27:01 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 2117559278de3b38e8ec6bb50113f5014f0183dc
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sat Aug 6 17:24:56 2016 +0800

    Move sdk-common, lint, asset-studio to libgradle-android-plugin-java as they have dependencies on each other
---
 debian/android-platform-tools-base.install |  2 --
 debian/android-platform-tools-base.links   |  4 +---
 debian/android-platform-tools-base.poms    |  5 -----
 debian/control                             | 36 +++++++++++++-----------------
 debian/libgradle-android-plugin-java.poms  |  5 +++++
 5 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/debian/android-platform-tools-base.install b/debian/android-platform-tools-base.install
index a0549cb..13e76f0 100644
--- a/debian/android-platform-tools-base.install
+++ b/debian/android-platform-tools-base.install
@@ -1,5 +1,3 @@
 draw9patch/etc/draw9patch                     usr/lib/android-sdk/tools
-lint/cli/build/lint.classpath                 usr/share/android-platform-tools-base
-lint/cli/etc/lint                             usr/lib/android-sdk/tools
 misc/screenshot2/build/screenshot2.classpath  usr/share/android-platform-tools-base
 misc/screenshot2/etc/screenshot2              usr/lib/android-sdk/tools
\ No newline at end of file
diff --git a/debian/android-platform-tools-base.links b/debian/android-platform-tools-base.links
index 50ab382..6694a26 100644
--- a/debian/android-platform-tools-base.links
+++ b/debian/android-platform-tools-base.links
@@ -1,6 +1,4 @@
 usr/lib/android-sdk/tools/draw9patch             usr/bin/draw9patch
-usr/lib/android-sdk/tools/lint                   usr/bin/lint
 usr/lib/android-sdk/tools/screenshot2            usr/bin/screenshot2
 usr/share/java/com.android.tools.draw9patch.jar  usr/lib/android-sdk/tools/lib/draw9patch.jar
-usr/share/java/com.android.tools.screenshot2.jar usr/lib/android-sdk/tools/lib/screenshot2.jar
-usr/share/java/com.android.tools.lint.lint.jar   usr/lib/android-sdk/tools/lib/lint.jar
\ No newline at end of file
+usr/share/java/com.android.tools.screenshot2.jar usr/lib/android-sdk/tools/lib/screenshot2.jar
\ No newline at end of file
diff --git a/debian/android-platform-tools-base.poms b/debian/android-platform-tools-base.poms
index 3b04c5f..d58425d 100644
--- a/debian/android-platform-tools-base.poms
+++ b/debian/android-platform-tools-base.poms
@@ -1,9 +1,4 @@
-asset-studio/build/asset-studio.pom         --java-lib --artifact=asset-studio/build/libs/*.jar           --usj-name=com.android.tools.asset-studio
 draw9patch/build/draw9patch.pom             --java-lib --artifact=draw9patch/build/libs/*.jar             --usj-name=com.android.tools.draw9patch
 legacy/archquery/build/archquery.pom        --java-lib --artifact=legacy/archquery/build/libs/*.jar       --usj-name=com.android.tools.archquery
-lint/cli/build/lint.pom                     --java-lib --artifact=lint/cli/build/libs/*.jar               --usj-name=com.android.tools.lint.lint
-lint/libs/lint-api/build/lint-api.pom       --java-lib --artifact=lint/libs/lint-api/build/libs/*.jar     --usj-name=com.android.tools.lint.lint-api
-lint/libs/lint-checks/build/lint-checks.pom --java-lib --artifact=lint/libs/lint-checks/build/libs/*.jar  --usj-name=com.android.tools.lint.lint-checks
 misc/screenshot2/build/screenshot2.pom      --java-lib --artifact=misc/screenshot2/build/libs/*.jar       --usj-name=com.android.tools.screenshot2
-sdk-common/build/sdk-common.pom             --java-lib --artifact=sdk-common/build/libs/*.jar             --usj-name=com.android.tools.sdk-common
 testutils/build/testutils.pom               --java-lib --artifact=testutils/build/libs/*.jar              --usj-name=com.android.tools.testutils
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 217cb54..25a6bd7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,8 @@ Build-Depends:
  libbcpkix-java,
  libbcprov-java,
  libcommons-compress-java,
- libhttpcore-java,
+ libecj-java,
+ libgoogle-gson-java,
  libhttpmime-java,
  libintellij-annotations-java,
  libjacoco-java,
@@ -40,19 +41,6 @@ Depends:
  adb,
  default-jre-headless (>= 1:1.6) | java6-runtime-headless,
  libandroid-ddms-java (>= ${binary:Version}),
- libandroid-layoutlib-api-java (>= ${binary:Version}),
- libandroid-tools-annotations-java (>= ${binary:Version}),
- libandroid-tools-common-java (>= ${binary:Version}),
- libandroid-tools-sdklib-java (>= ${binary:Version}),
- libasm4-java,
- libbcpkix-java,
- libbcprov-java,
- libecj-java,
- libgoogle-gson-java,
- libguava-java,
- libhttpcore-java,
- libintellij-annotations-java,
- liblombok-ast-java,
  ${misc:Depends}
 Suggests: default-jre
 Description: base tools for developing applications for the Android system
@@ -63,10 +51,7 @@ Description: base tools for developing applications for the Android system
     WYSIWYG editor. It also previews stretched versions of the image, and
     highlights the area in which content is allowed.
  .
-  * Lint: Android Lint is a tool that scans Android projects for potential
-    bugs.
- .
-  * Various Java libraries used by Android SDK.
+  * screenshot2: Takes a screenshot from a remote Andrid device.
  .
  default-jre or other non-headless JRE needs to be installed in order to run
  "draw9patch". However draw9patch fails to run due to bug #798794.
@@ -82,6 +67,8 @@ Description: annotations used throughout the Android tools libraries
 Package: libandroid-tools-common-java
 Architecture: all
 Depends:
+ libandroid-tools-annotations-java (>= ${binary:Version}),
+ libguava-java,
  ${misc:Depends}
 Description: common library used by other Android tools libraries
  This package provides common tasks and classes which are used by other Android
@@ -94,12 +81,20 @@ Depends: android-platform-tools-base,
          antlr4,
          libandroid-databinding-java,
          libandroid-ddms-java (>= ${binary:Version}),
+         libandroid-layoutlib-api-java (>= ${binary:Version}),
          libandroid-tools-common-java (>= ${binary:Version}),
          libandroid-tools-sdklib-java (>= ${binary:Version}),
-         libjacoco-java,
-         libjavawriter-java,
+         libasm4-java,
+         libbcpkix-java,
+         libbcprov-java,
+         libecj-java,
          libgradle-core-java,
          libgradle-plugins-java,
+         libgoogle-gson-java,
+         libguava-java,
+         libjacoco-java,
+         libjavawriter-java,
+         liblombok-ast-java,
          proguard,
          ${misc:Depends}
 Breaks: android-platform-tools-base (<< 2.0.0-1)
@@ -158,6 +153,7 @@ Description: Library providing APIs to talk to Android devices
 Package: libandroid-layoutlib-api-java
 Architecture: all
 Depends: libandroid-tools-common-java,
+         libintellij-annotations-java,
          ${misc:Depends}
 Description: library to use the rendering library for Android layouts
  This package provides "layoutlib-api.jar" in the Android SDK.
diff --git a/debian/libgradle-android-plugin-java.poms b/debian/libgradle-android-plugin-java.poms
index f289526..74dddac 100644
--- a/debian/libgradle-android-plugin-java.poms
+++ b/debian/libgradle-android-plugin-java.poms
@@ -1,3 +1,4 @@
+asset-studio/build/asset-studio.pom                      --java-lib --artifact=asset-studio/build/libs/*.jar                  --usj-name=com.android.tools.asset-studio
 build-system/builder-model/build/builder-model.pom       --java-lib --artifact=build-system/builder-model/build/libs/*.jar    --usj-name=com.android.tools.build.builder-model
 build-system/builder-test-api/build/builder-test-api.pom --java-lib --artifact=build-system/builder-test-api/build/libs/*.jar --usj-name=com.android.tools.build.builder-test-api
 build-system/builder/build/builder.pom                   --java-lib --artifact=build-system/builder/build/libs/*.jar          --usj-name=com.android.tools.build.builder
@@ -9,3 +10,7 @@ build-system/manifest-merger/build/manifest-merger.pom   --java-lib --artifact=b
 build-system/transform-api/build/transform-api.pom       --java-lib --artifact=build-system/transform-api/build/libs/*.jar    --usj-name=com.android.tools.build.transform-api
 jack/jack-api/build/jack-api.pom                         --java-lib --artifact=jack/jack-api/build/libs/*.jar                 --usj-name=com.android.tools.jack.jack-api
 jack/jill-api/build/jill-api.pom                         --java-lib --artifact=jack/jill-api/build/libs/*.jar                 --usj-name=com.android.tools.jill.jill-api
+lint/cli/build/lint.pom                                  --java-lib --artifact=lint/cli/build/libs/*.jar                      --usj-name=com.android.tools.lint.lint
+lint/libs/lint-api/build/lint-api.pom                    --java-lib --artifact=lint/libs/lint-api/build/libs/*.jar            --usj-name=com.android.tools.lint.lint-api
+lint/libs/lint-checks/build/lint-checks.pom              --java-lib --artifact=lint/libs/lint-checks/build/libs/*.jar         --usj-name=com.android.tools.lint.lint-checks
+sdk-common/build/sdk-common.pom                          --java-lib --artifact=sdk-common/build/libs/*.jar                    --usj-name=com.android.tools.sdk-common

-- 
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