Merge "Remove framework2" into lmp-dev
diff --git a/core/config.mk b/core/config.mk
index 5de9ede..716f88f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -534,7 +534,7 @@
# 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
diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 5f0dc6f..d3e61d5 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -72,7 +72,7 @@
$(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))
diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index fd63820..838754f 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -57,7 +57,6 @@
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 \
diff --git a/target/product/base.mk b/target/product/base.mk
index 981f965..fa0489b 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -31,7 +31,6 @@
dhcpcd-run-hooks \
dnsmasq \
framework \
- framework2 \
fsck_msdos \
ime \
input \
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 4209ef9..0c453dd 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -84,7 +84,6 @@
bouncycastle \
ext \
framework \
- framework2 \
telephony-common \
voip-common \
ims-common \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 48abfa5..d6e4dc5 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -87,7 +87,6 @@
bouncycastle \
ext \
framework \
- framework2 \
telephony-common \
voip-common \
ims-common \