Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 102767cd authored Oct 29, 2009 by Ying Wang Committed by Android Git Automerger Oct 29, 2009

am d85c4b34: Merge change Idb328ab7 into eclair

Merge commit 'd85c4b34' into eclair-mr2

* commit 'd85c4b34':
  Explicitly specify that online-sdk depends on framework-res.

parents 0b12dc3a d85c4b34

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -491,6 +491,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)

core/res/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -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)