summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2012-04-23 15:43:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-23 15:43:35 -0700
commitc094c0a68fe311ea671b4c95756d300bc6a540f4 (patch)
tree68f8cbab0b8bdc1b9c4d54b6253ea97d0b95520b
parent76f57fe3737a5f88c536f3fe936f2343bbe3b1f3 (diff)
parentd0831659af544b93f3a9592a1cd4f85ff89e8635 (diff)
downloadbuild-c094c0a68fe311ea671b4c95756d300bc6a540f4.zip
build-c094c0a68fe311ea671b4c95756d300bc6a540f4.tar.gz
build-c094c0a68fe311ea671b4c95756d300bc6a540f4.tar.bz2
am d0831659: Merge "Split target/product/sdk.mk into sdk.git"
* commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635': Split target/product/sdk.mk into sdk.git
-rw-r--r--target/product/sdk.mk65
1 files changed, 3 insertions, 62 deletions
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index a60a77a..f586f06 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -62,68 +62,9 @@ PRODUCT_PACKAGES := \
CalendarProvider \
Calendar
-
-# Host tools that are parts of the SDK.
-# See development/build/sdk.atree
-PRODUCT_PACKAGES += \
- adb \
- dmtracedump \
- etc1tool \
- hprof-conv \
- mksdcard \
- emulator \
- bios.bin \
- vgabios-cirrus.bin \
- ddms \
- hierarchyviewer \
- draw9patch \
- traceview \
- android \
- dexdump \
- lint \
- monkeyrunner
-
-# Native host Java libraries that are parts of the SDK.
-# See development/build/sdk.atree
-PRODUCT_PACKAGES += \
- androidprefs \
- annotations \
- sdkstats \
- archquery \
- ddms \
- ddmlib \
- ddmuilib \
- draw9patch \
- hierarchyviewer \
- traceview \
- anttasks \
- sdklib \
- sdkuilib \
- sdkmanager \
- swtmenubar \
- swing-worker-1.1 \
- groovy-all-1.7.0 \
- commons-compress-1.0 \
- emmalib \
- jcommon-1.0.12 \
- jfreechart-1.0.9 \
- jfreechart-1.0.9-swt \
- org.eclipse.core.commands_3.4.0.I20080509-2000 \
- org.eclipse.equinox.common_3.4.0.v20080421-2006 \
- org.eclipse.jface_3.4.2.M20090107-0800 \
- osgi \
- layoutlib \
- lint \
- monkeyrunner \
- guavalib \
- jsr305lib \
- jython \
- ddmlib-tests \
- ninepatch-tests \
- common-tests \
- sdklib-tests \
- sdkuilib-tests \
- layoutlib-tests
+# Define the host tools and libs that are parts of the SDK.
+include sdk/build/product_sdk.mk
+include development/build/product_sdk.mk
# audio libraries.
PRODUCT_PACKAGES += \