Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Ib9cc041e into eclair-sdk

Browse Source 
* changes:
  Explicitly specify that online-sdk depends on framework-res. (do not merge)
This commit is contained in:
Android (Google) Code Review
2009-11-04 19:08:59 -05:00
parent 00e44ef217 b9cc041eb0
commit e33044eadf
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -489,6 +489,8 @@ LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
include $(BUILD_DROIDDOC) 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 ======================= # ==== docs that have all of the stuff that's @hidden =======================
include $(CLEAR_VARS) include $(CLEAR_VARS)

4
core/res/Android.mk
View File

@@ -34,3 +34,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_JAVA_LIBRARIES)
LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_EXPORT_PACKAGE_RESOURCES := true
include $(BUILD_PACKAGE) 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)