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

Commit 1f816cf5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

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.
parents c3d743d2 81ab3c59

core/pathmap.mk

+6 −0
Original line number Diff line number Diff line
@@ -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 \

	 )



#