StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f711e349: am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Browse Source 
Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'

* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
  Include the common source files directly in the framework library
This commit is contained in:
Dan Egnor
2009-11-18 18:01:11 -08:00
committed by Android Git Automerger
parent 00dbcf8f05 f711e3494c
commit 886332b8be
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/pathmap.mk
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 # A list of all source roots under frameworks/base, which will be
# built into the android.jar. # 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 := \ FRAMEWORKS_BASE_SUBDIRS := \
$(addsuffix /java, \ $(addsuffix /java, \
core \ core \
@@ -84,6 +89,7 @@ FRAMEWORKS_BASE_SUBDIRS := \
wifi \ wifi \
vpn \ vpn \
keystore \ keystore \
common \
) )
# #