Merge "Remove obsolete variables." into jb-mr1-dev (9f814ac5) · Commits · e / os / android_frameworks_base

Android.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -237,9 +237,6 @@ LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext
		LOCAL_MODULE := framework
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		LOCAL_NO_EMMA_INSTRUMENT := true
		LOCAL_NO_EMMA_COMPILE := true

		# List of classes and interfaces which should be loaded by the Zygote.
		LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes

		@@ -725,9 +722,6 @@ LOCAL_JAVA_RESOURCE_DIRS := $(ext_res_dirs)
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE := ext

		LOCAL_NO_EMMA_INSTRUMENT := true
		LOCAL_NO_EMMA_COMPILE := true

		LOCAL_DX_FLAGS := --core-library

		include $(BUILD_JAVA_LIBRARY)

+0 −3

Original line number	Diff line number	Diff line
		@@ -13,9 +13,6 @@ LOCAL_MODULE:= services

		LOCAL_JAVA_LIBRARIES := android.policy telephony-common

		LOCAL_NO_EMMA_INSTRUMENT := true
		LOCAL_NO_EMMA_COMPILE := true

		include $(BUILD_JAVA_LIBRARY)

		include $(BUILD_DROIDDOC)