Move more packages to framework2 (08a7b764) · Commits · e / os / android_frameworks_base

Android.mk

+57 −2

Original line number	Diff line number	Diff line
		@@ -377,7 +377,54 @@ LOCAL_STATIC_JAVA_LIBRARIES := framework-base
		LOCAL_DX_FLAGS := --core-library

		# Packages to include, use \* wildcard to include descendants.
		LOCAL_JAR_PACKAGES := android\*
		LOCAL_JAR_PACKAGES := \
		android \
		android.accessibilityservice\* \
		android.accounts\* \
		android.alsa\* \
		android.animation\* \
		android.annotation\* \
		android.app\* \
		android.appwidget\* \
		android.bluetooth\* \
		android.content\* \
		android.content\* \
		android.database\* \
		android.ddm\* \
		android.drm\* \
		android.emoji\* \
		android.filterfw\* \
		android.filterpacks\* \
		android.gesture\* \
		android.graphics\* \
		android.inputmethodservice\* \
		android.location\* \
		android.media\* \
		android.mtp\* \
		android.net\* \
		android.nfc\* \
		android.opengl\* \
		android.os\* \
		android.preference\* \
		android.print\* \
		android.printservice\* \
		android.provider\* \
		android.renderscript\* \
		android.sax\* \
		android.security\* \
		android.service\* \
		android.speech\* \
		android.system\* \
		android.telecomm\* \
		android.telephony\* \
		android.test\* \
		android.text\* \
		android.transition\* \
		android.tv\* \
		android.util\* \
		android.view\* \
		android.webkit\* \
		android.widget\*

		# List of classes and interfaces which should be loaded by the Zygote.
		LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes
		@@ -396,7 +443,15 @@ LOCAL_STATIC_JAVA_LIBRARIES := framework-base
		LOCAL_DX_FLAGS := --core-library

		# Packages to include, use \* wildcard to include descendants.
		LOCAL_JAR_PACKAGES := com\* javax\*
		# 'android' is required to be able to include 'android.hardware',
		# however, it causes classes in 'android' to be part of framework
		# and framework2.
		# TODO: Finer grained matching.
		LOCAL_JAR_PACKAGES := \
		android \
		android.hardware\* \
		com\* \
		javax\*

		include $(BUILD_JAVA_LIBRARY)
		framework2_module := $(LOCAL_INSTALLED_MODULE)