From b9cc041eb0ec10a75973025cacd9a3316090a13d Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 27 Oct 2009 11:00:30 -0700 Subject: Explicitly specify that online-sdk depends on framework-res. (do not merge) this is integrated from Eclair to fix the mac build breakages. --- Android.mk | 2 ++ core/res/Android.mk | 4 ++++ 2 files changed, 6 insertions(+) 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) -- cgit v1.2.3-59-g8ed1b