am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Merge commit '1f816cf57b93654638989e6007d669c04b3d9b88' into eclair-mr2-plus-aosp

* commit '1f816cf57b93654638989e6007d669c04b3d9b88':
  Include the common source files directly in the framework library

core/pathmap.mk

@@ -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 \
 	 )
 
 #