Merge change I362bebd3 into eclair-mr2

* changes:
  Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently.
This commit is contained in:
Android (Google) Code Review 2009-11-18 17:22:32 -08:00
commit 1f816cf57b
1 changed files with 6 additions and 0 deletions

View File

@ -72,6 +72,11 @@ JNI_H_INCLUDE := $(call include-path-for,libnativehelper)/nativehelper
# A list of all source roots under frameworks/base, which will be
# built into the android.jar.
#
# Note - "common" is included here, even though it is also built
# into a static library (android-common) for unbundled use. This
# is so common and the other framework libraries can have mutual
# interdependencies.
#
FRAMEWORKS_BASE_SUBDIRS := \
$(addsuffix /java, \
core \
@ -84,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \
wifi \
vpn \
keystore \
common \
)
#