summaryrefslogtreecommitdiffstats
path: root/Android.mk
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 /Android.mk
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 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 162866b..a40d3f9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -491,6 +491,8 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC)
+# explicitly specify that online-sdk depends on framework-res.
+$(full_target): framework-res-package-target
# ==== docs that have all of the stuff that's @hidden =======================
include $(CLEAR_VARS)