Remove framework2
We don't need fraemwork2 split with the multidex framework.jar. Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
This commit is contained in:
parent
0486200762
commit
14c975b830
|
@ -534,7 +534,7 @@ endif
|
|||
|
||||
# allow overriding default Java libraries on a per-target basis
|
||||
ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
|
||||
TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework framework2
|
||||
TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework
|
||||
endif
|
||||
|
||||
TARGET_CPU_SMP ?= true
|
||||
|
|
|
@ -72,7 +72,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
|
|||
$(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))
|
||||
endif
|
||||
else
|
||||
LOCAL_JAVA_LIBRARIES := core-libart ext framework framework2 $(LOCAL_JAVA_LIBRARIES)
|
||||
LOCAL_JAVA_LIBRARIES := core-libart ext framework $(LOCAL_JAVA_LIBRARIES)
|
||||
$(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-libart)
|
||||
endif # LOCAL_SDK_VERSION
|
||||
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
|
||||
|
|
|
@ -57,7 +57,6 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \
|
|||
target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/ext_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/framework_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/framework2_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/android.test.runner_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/telephony-common_intermediates \
|
||||
target/common/obj/JAVA_LIBRARIES/voip-common_intermediates \
|
||||
|
|
|
@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \
|
|||
dhcpcd-run-hooks \
|
||||
dnsmasq \
|
||||
framework \
|
||||
framework2 \
|
||||
fsck_msdos \
|
||||
ime \
|
||||
input \
|
||||
|
|
|
@ -84,7 +84,6 @@ PRODUCT_BOOT_JARS := \
|
|||
bouncycastle \
|
||||
ext \
|
||||
framework \
|
||||
framework2 \
|
||||
telephony-common \
|
||||
voip-common \
|
||||
ims-common \
|
||||
|
|
|
@ -87,7 +87,6 @@ PRODUCT_BOOT_JARS := \
|
|||
bouncycastle \
|
||||
ext \
|
||||
framework \
|
||||
framework2 \
|
||||
telephony-common \
|
||||
voip-common \
|
||||
ims-common \
|
||||
|
|
Loading…
Reference in New Issue