Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f028239 authored by Santhosh Kumar H E's avatar Santhosh Kumar H E Committed by Steve Kondik
Browse files

Remove make file changes to create framework2 

Face detection related changes were added as part of framework2
in kitkat. But in Android L framework2 is no more required, all
the code gets compiled into framework.jar so removing framework2
related make file changes.

Change-Id: I278acc501c04b02bd5abbc6203911f77c30ea243
parent f6ddd101

Android.mk

+0 −21
Original line number Diff line number Diff line
@@ -428,27 +428,6 @@ 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 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



include $(BUILD_JAVA_LIBRARY)

framework2_module := $(LOCAL_INSTALLED_MODULE)



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



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