aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-03-14 23:18:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-03-14 23:18:34 +0000
commit8647d225b5f76cedad49692da1f4404a919d2f1f (patch)
tree8abbad1958e9bca9411e487dc71cb5708e3553db
parenta0d1417f56964bbda86671699d480a586350675c (diff)
parentd50dbbfdda398c9f7915f00880bb9e0d65c98d8a (diff)
downloadsdk-8647d225b5f76cedad49692da1f4404a919d2f1f.zip
sdk-8647d225b5f76cedad49692da1f4404a919d2f1f.tar.gz
sdk-8647d225b5f76cedad49692da1f4404a919d2f1f.tar.bz2
Merge "Fix build."
-rw-r--r--dumpeventlog/src/Android.mk3
-rw-r--r--eventanalyzer/src/Android.mk3
-rw-r--r--hierarchyviewer/src/Android.mk6
3 files changed, 5 insertions, 7 deletions
diff --git a/dumpeventlog/src/Android.mk b/dumpeventlog/src/Android.mk
index bf99375..f0c1aeb 100644
--- a/dumpeventlog/src/Android.mk
+++ b/dumpeventlog/src/Android.mk
@@ -7,8 +7,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_JAVA_LIBRARIES := \
- ddmlib
+ ddmlib-prebuilt
LOCAL_MODULE := dumpeventlog
include $(BUILD_HOST_JAVA_LIBRARY)
-
diff --git a/eventanalyzer/src/Android.mk b/eventanalyzer/src/Android.mk
index e65c61f..1d55be5 100644
--- a/eventanalyzer/src/Android.mk
+++ b/eventanalyzer/src/Android.mk
@@ -20,8 +20,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_JAVA_LIBRARIES := \
- ddmlib
+ ddmlib-prebuilt
LOCAL_MODULE := eventanalyzer
include $(BUILD_HOST_JAVA_LIBRARY)
-
diff --git a/hierarchyviewer/src/Android.mk b/hierarchyviewer/src/Android.mk
index e84c8f8..1fdc8ca 100644
--- a/hierarchyviewer/src/Android.mk
+++ b/hierarchyviewer/src/Android.mk
@@ -20,9 +20,9 @@ LOCAL_JAVA_RESOURCE_DIRS := resources
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_JAVA_LIBRARIES := \
- ddmlib \
- org-openide-util \
- org-netbeans-api-visual
+ ddmlib-prebuilt \
+ org-openide-util \
+ org-netbeans-api-visual
LOCAL_MODULE := hierarchyviewer
LOCAL_MODULE_TAGS := debug