diff options
| author | 2009-11-04 19:08:59 -0500 | |
|---|---|---|
| committer | 2009-11-04 19:08:59 -0500 | |
| commit | e33044eadfa9969e71e50d1aff165cbc436b13f3 (patch) | |
| tree | 42f2158125defeecf0a81f65bf09fca270a6acda | |
| parent | 00e44ef21777f32b67a8d51ee375cd290a3fb2d4 (diff) | |
| parent | b9cc041eb0ec10a75973025cacd9a3316090a13d (diff) | |
Merge change Ib9cc041e into eclair-sdk
* changes:
Explicitly specify that online-sdk depends on framework-res. (do not merge)
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | core/res/Android.mk | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 5d4c5c1a3e5d..d92809a9ab7e 100644 --- a/Android.mk +++ b/Android.mk @@ -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 cb5524a6dc30..78cb86dd9027 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) |