Merge "Remove make file changes to create framework2"

	$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp

$(full_classes_compiled_jar): $(framework_res_R_stamp)

# 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.hardware \

    com \

    javax \

    org \

    codeaurora

include $(BUILD_JAVA_LIBRARY)

framework2_module := $(LOCAL_INSTALLED_MODULE)

$(framework_module): | $(dir $(framework_module))framework-res.apk

framework_built := $(call java-lib-deps,framework)