diff options
| -rw-r--r-- | Android.mk | 68 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/Android.mk | 2 | ||||
| -rw-r--r-- | tools/layoutlib/Android.mk | 4 |
4 files changed, 13 insertions, 63 deletions
@@ -391,40 +391,11 @@ LOCAL_INTERMEDIATE_SOURCES := \ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext -LOCAL_MODULE := framework-base - -LOCAL_RMTYPEDEFS := true - -include $(BUILD_STATIC_JAVA_LIBRARY) - -# Make sure that R.java and Manifest.java are built before we build -# the source for this library. -framework_res_R_stamp := \ - $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp -$(full_classes_compiled_jar): $(framework_res_R_stamp) - -# Build part 1 of the framework library. -# ============================================================ -include $(CLEAR_VARS) - LOCAL_MODULE := framework -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_STATIC_JAVA_LIBRARIES := framework-base -LOCAL_DX_FLAGS := --core-library -# List of packages to include along with their descendants. -LOCAL_JAR_PACKAGES := \ - android +LOCAL_DX_FLAGS := --core-library --multi-dex -# List of packages to exclude along with their descendants. -# Overrides inclusion. -LOCAL_JAR_EXCLUDE_PACKAGES := \ - android.bluetooth \ - android.filterfw \ - android.filterpacks \ - android.hardware \ - android.telephony +LOCAL_RMTYPEDEFS := true # List of classes and interfaces which should be loaded by the Zygote. LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes @@ -432,35 +403,15 @@ LOCAL_JAVA_RESOURCE_FILES += $(LOCAL_PATH)/preloaded-classes include $(BUILD_JAVA_LIBRARY) framework_module := $(LOCAL_INSTALLED_MODULE) -# Build part 2 of the framework library. -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE := framework2 -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_STATIC_JAVA_LIBRARIES := framework-base -LOCAL_DX_FLAGS := --core-library - -# List of packages to include along with their descendants. -LOCAL_JAR_PACKAGES := \ - android.bluetooth \ - android.filterfw \ - android.filterpacks \ - android.hardware \ - android.telephony \ - com \ - javax - -include $(BUILD_JAVA_LIBRARY) -framework2_module := $(LOCAL_INSTALLED_MODULE) +# Make sure that R.java and Manifest.java are built before we build +# the source for this library. +framework_res_R_stamp := \ + $(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp +$(full_classes_compiled_jar): $(framework_res_R_stamp) -# Make sure that all framework modules are installed when framework is. -# ============================================================ $(framework_module): | $(dir $(framework_module))framework-res.apk -$(framework_module): | $(dir $(framework_module))framework2.jar -framework_built := $(call java-lib-deps,framework framework2) +framework_built := $(call java-lib-deps,framework) # Copy AIDL files to be preprocessed and included in the SDK, # specified relative to the root of the build tree. @@ -636,7 +587,6 @@ framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \ okhttp \ ext \ framework \ - framework2 \ telephony-common \ voip-common @@ -678,7 +628,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -overview $(LOCAL_PATH)/core/java/overview.html framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \ - $(call intermediates-dir-for,JAVA_LIBRARIES,framework-base,,COMMON) + $(call intermediates-dir-for,JAVA_LIBRARIES,framework,,COMMON) framework_docs_LOCAL_ADDITIONAL_JAVA_DIR:= \ $(framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR) \ diff --git a/CleanSpec.mk b/CleanSpec.mk index 2c9ea54..3014e0f 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -210,6 +210,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/ims-common_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework2_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecomm) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework.* $(PRODUCT_OUT)/system/framework2.*) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER diff --git a/packages/PrintSpooler/Android.mk b/packages/PrintSpooler/Android.mk index a3a1f8c..3fbd4d8 100644 --- a/packages/PrintSpooler/Android.mk +++ b/packages/PrintSpooler/Android.mk @@ -22,8 +22,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := PrintSpooler -LOCAL_JAVA_LIBRARIES := framework-base - LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview include $(BUILD_PACKAGE) diff --git a/tools/layoutlib/Android.mk b/tools/layoutlib/Android.mk index ead3b13..9300401 100644 --- a/tools/layoutlib/Android.mk +++ b/tools/layoutlib/Android.mk @@ -27,8 +27,8 @@ LOCAL_JAVACFLAGS := -source 6 -target 6 # We need to process the framework classes.jar file, but we can't # depend directly on it (private vars won't be inherited correctly). # So, we depend on framework's BUILT file. -built_framework_dep := $(call java-lib-deps,framework-base) -built_framework_classes := $(call java-lib-files,framework-base) +built_framework_dep := $(call java-lib-deps,framework) +built_framework_classes := $(call java-lib-files,framework) built_core_dep := $(call java-lib-deps,core-libart) built_core_classes := $(call java-lib-files,core-libart) |