From 81ab3c593a2546dad8db23284fc86bd689cf1245 Mon Sep 17 00:00:00 2001 From: Dan Egnor Date: Wed, 18 Nov 2009 14:42:40 -0800 Subject: [PATCH] Include the common source files directly in the framework library when building, to allow mutual interdependencies; the common static library will be built independently. --- core/pathmap.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/pathmap.mk b/core/pathmap.mk index 1ae663de5..bc2fcb420 100644 --- a/core/pathmap.mk +++ b/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 \ ) #