summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2009-10-29 02:04:17 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 02:04:17 -0700
commit87c72717ee7749d5dd424f258349cc6f75c5e124 (patch)
treea21454575b1bfa012ff6009c31f14edb3c6b480a /core
parentefdccdf60216e4c6cc56d46b074068b78551017b (diff)
parent69e73d01e5e883c84422096fb078eced8bb98b68 (diff)
downloadframeworks_base-87c72717ee7749d5dd424f258349cc6f75c5e124.zip
frameworks_base-87c72717ee7749d5dd424f258349cc6f75c5e124.tar.gz
frameworks_base-87c72717ee7749d5dd424f258349cc6f75c5e124.tar.bz2
am 69e73d01: am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit '69e73d01e5e883c84422096fb078eced8bb98b68' * commit '69e73d01e5e883c84422096fb078eced8bb98b68': Explicitly specify that online-sdk depends on framework-res.
Diffstat (limited to 'core')
-rw-r--r--core/res/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/Android.mk b/core/res/Android.mk
index cb5524a..78cb86d 100644
--- a/core/res/Android.mk
+++ b/core/res/Android.mk
@@ -34,3 +34,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)
LOCAL_EXPORT_PACKAGE_RESOURCES := true
include $(BUILD_PACKAGE)
+
+# define a global intermediate target that other module may depend on.
+.PHONY: framework-res-package-target
+framework-res-package-target: $(LOCAL_BUILT_MODULE)