summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-15 14:24:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-15 14:24:58 -0700
commitb03eaf3f65de1e5dc775bacecd91f278990e061d (patch)
tree9f7709b7500f12d161263b8a3bf248c367aa369c
parent9161e1ce2a9b4d115dda9b5b33b5acdf1a3d7078 (diff)
parentd103af4f4e8bd639578f409c9ea767bd52c45124 (diff)
downloadframeworks_native-b03eaf3f65de1e5dc775bacecd91f278990e061d.zip
frameworks_native-b03eaf3f65de1e5dc775bacecd91f278990e061d.tar.gz
frameworks_native-b03eaf3f65de1e5dc775bacecd91f278990e061d.tar.bz2
am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp * commit '27357fc08802d796a6b6a1111ac5534d75fc8be7': Use the droidcore goal with dist-for-goals.
-rw-r--r--common/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/Android.mk b/common/Android.mk
index 1f78840..269ac5a 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := \
include $(BUILD_STATIC_JAVA_LIBRARY)
# Include this library in the build server's output directory
-$(call dist-for-goals, droid, $(LOCAL_BUILT_MODULE):android-common.jar)
+$(call dist-for-goals, droidcore, $(LOCAL_BUILT_MODULE):android-common.jar)
# Build the test package
include $(call all-makefiles-under, $(LOCAL_PATH))