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

am d85c4b34: Merge change Idb328ab7 into eclair

Browse Source 
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2

* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
  Explicitly specify that online-sdk depends on framework-res.
This commit is contained in:
Ying Wang
2009-10-29 01:23:58 -07:00
committed by Android Git Automerger
parent 0b12dc3aca d85c4b346f
commit 102767cd3b
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

@@ -491,6 +491,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)