diff options
| author | Ying Wang <wangying@google.com> | 2014-07-21 14:42:29 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-21 14:42:29 -0700 |
| commit | 14c975b830aa764272bb76aa207b5dbf15fe422e (patch) | |
| tree | 340e6951a91f076d8a44a50a90361cd4058c788a | |
| parent | 0486200762a0be6080579dd60044ae3ff88f616a (diff) | |
| download | build-14c975b830aa764272bb76aa207b5dbf15fe422e.tar.gz build-14c975b830aa764272bb76aa207b5dbf15fe422e.tar.bz2 build-14c975b830aa764272bb76aa207b5dbf15fe422e.zip | |
Remove framework2
We don't need fraemwork2 split with the multidex framework.jar.
Change-Id: Ifc595b3679946d8958a9282360c7da9bc18e8adc
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/droiddoc.mk | 2 | ||||
| -rw-r--r-- | core/pdk_config.mk | 1 | ||||
| -rw-r--r-- | target/product/base.mk | 1 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 1 | ||||
| -rw-r--r-- | target/product/core_tiny.mk | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/core/config.mk b/core/config.mk index 46f90844a..ad12fef5f 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 5f0dc6fd8..d3e61d57c 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -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)) diff --git a/core/pdk_config.mk b/core/pdk_config.mk index fd63820ff..838754fa8 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -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 \ diff --git a/target/product/base.mk b/target/product/base.mk index 981f965aa..fa0489bac 100644 --- a/target/product/base.mk +++ b/target/product/base.mk @@ -31,7 +31,6 @@ PRODUCT_PACKAGES += \ 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 4209ef97a..0c453dd84 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -84,7 +84,6 @@ PRODUCT_BOOT_JARS := \ 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 48abfa550..d6e4dc58c 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -87,7 +87,6 @@ PRODUCT_BOOT_JARS := \ bouncycastle \ ext \ framework \ - framework2 \ telephony-common \ voip-common \ ims-common \ |