diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d3cadb5b3..b47071a23 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -51,7 +51,6 @@ LOCAL_CTS_TEST_PACKAGE:= LOCAL_CTS_TEST_RUNNER:= LOCAL_CXX:= LOCAL_CXX_STL := default -LOCAL_DATA_BINDING:= LOCAL_DEX_PREOPT_APP_IMAGE:= LOCAL_DEX_PREOPT_FLAGS:= LOCAL_DEX_PREOPT_GENERATE_PROFILE:= diff --git a/core/package_internal.mk b/core/package_internal.mk index a46d76a09..5d736a53a 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -309,23 +309,6 @@ endif # LOCAL_EMMA_INSTRUMENT rs_compatibility_jni_libs := -ifeq ($(LOCAL_DATA_BINDING),true) -data_binding_intermediates := $(intermediates.COMMON)/data-binding - -LOCAL_JAVACFLAGS += -processorpath $(DATA_BINDING_COMPILER) -s $(data_binding_intermediates)/anno-src - -LOCAL_STATIC_JAVA_LIBRARIES += databinding-baselibrary -LOCAL_STATIC_JAVA_AAR_LIBRARIES += databinding-library databinding-adapters - -data_binding_res_in := $(LOCAL_RESOURCE_DIR) -data_binding_res_out := $(data_binding_intermediates)/res - -# Replace with the processed merged res dir. -LOCAL_RESOURCE_DIR := $(data_binding_res_out) - -LOCAL_AAPT_FLAGS += --auto-add-overlay --extra-packages com.android.databinding.library -endif # LOCAL_DATA_BINDING - # If the module is a compressed module, we don't pre-opt it because its final # installation location will be the data partition. ifdef LOCAL_COMPRESSED_MODULE @@ -460,34 +443,6 @@ endif $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_ANDROID_MANIFEST := $(full_android_manifest) -ifeq ($(LOCAL_DATA_BINDING),true) -data_binding_stamp := $(data_binding_intermediates)/data-binding.stamp -$(data_binding_stamp): PRIVATE_INTERMEDIATES := $(data_binding_intermediates) -$(data_binding_stamp): PRIVATE_MANIFEST := $(full_android_manifest) -# Generate code into $(LOCAL_INTERMEDIATE_SOURCE_DIR) so that the generated .java files -# will be automatically picked up by function compile-java. -$(data_binding_stamp): PRIVATE_SRC_OUT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/data-binding -$(data_binding_stamp): PRIVATE_XML_OUT := $(data_binding_intermediates)/xml -$(data_binding_stamp): PRIVATE_RES_OUT := $(data_binding_res_out) -$(data_binding_stamp): PRIVATE_RES_IN := $(data_binding_res_in) -$(data_binding_stamp): PRIVATE_ANNO_SRC_DIR := $(data_binding_intermediates)/anno-src - -$(data_binding_stamp) : $(all_res_assets) $(full_android_manifest) \ - $(DATA_BINDING_COMPILER) - @echo "Data-binding process: $@" - @rm -rf $(PRIVATE_INTERMEDIATES) $(PRIVATE_SRC_OUT) && \ - mkdir -p $(PRIVATE_INTERMEDIATES) $(PRIVATE_SRC_OUT) \ - $(PRIVATE_XML_OUT) $(PRIVATE_RES_OUT) $(PRIVATE_ANNO_SRC_DIR) - $(hide) $(JAVA) -classpath $(DATA_BINDING_COMPILER) android.databinding.tool.MakeCopy \ - $(PRIVATE_MANIFEST) $(PRIVATE_SRC_OUT) $(PRIVATE_XML_OUT) $(PRIVATE_RES_OUT) $(PRIVATE_RES_IN) - $(hide) touch $@ - -# Make sure the data-binding process happens before javac and generation of R.java. -$(R_file_stamp): $(data_binding_stamp) -$(java_source_list_file): $(data_binding_stamp) -$(full_classes_compiled_jar): $(data_binding_stamp) -endif # LOCAL_DATA_BINDING - framework_res_package_export := ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)