summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2009-10-29 01:23:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 01:23:58 -0700
commit102767cd3be39fd3865be02421fd1763f3ff33d5 (patch)
treec1151063f14372fba3a8b4bf748553deae6056c1 /core
parent0b12dc3acaa5e6b2b0ac05374faf65a7e212ae4f (diff)
parentd85c4b346fe8e335a979b8bbfd2767eae91aca35 (diff)
downloadframeworks_base-102767cd3be39fd3865be02421fd1763f3ff33d5.zip
frameworks_base-102767cd3be39fd3865be02421fd1763f3ff33d5.tar.gz
frameworks_base-102767cd3be39fd3865be02421fd1763f3ff33d5.tar.bz2
am d85c4b34: Merge change Idb328ab7 into eclair
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2 * commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35': 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)