diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 19:02:47 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-27 19:02:47 -0400 |
| commit | d85c4b346fe8e335a979b8bbfd2767eae91aca35 (patch) | |
| tree | c2d15d0f1c9c6e530862b4e3ab64e54022e04b58 | |
| parent | aebcaec3c171f636a24051ce85ded2f86b09461b (diff) | |
| parent | db328ab7d47931a6433a778314bc7adbbfb96c8f (diff) | |
| download | frameworks_base-d85c4b346fe8e335a979b8bbfd2767eae91aca35.zip frameworks_base-d85c4b346fe8e335a979b8bbfd2767eae91aca35.tar.gz frameworks_base-d85c4b346fe8e335a979b8bbfd2767eae91aca35.tar.bz2 | |
Merge change Idb328ab7 into eclair
* changes:
Explicitly specify that online-sdk depends on framework-res.
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | core/res/Android.mk | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -489,6 +489,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) 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) |