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

Commit 8419b7f3 authored by Ying Wang's avatar Ying Wang
Browse files

Include classes.jar with class files in aar. 

As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.

Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
parent bc3720c6

core/static_java_library.mk

+2 −2
Original line number Diff line number Diff line
@@ -177,10 +177,10 @@ $(full_classes_compiled_jar): $(R_file_stamp) 
built_aar := $(intermediates.COMMON)/javalib.aar

$(built_aar): PRIVATE_MODULE := $(LOCAL_MODULE)

$(built_aar): PRIVATE_ANDROID_MANIFEST := $(full_android_manifest)

$(built_aar): PRIVATE_CLASSES_JAR := $(LOCAL_BUILT_MODULE)

$(built_aar): PRIVATE_CLASSES_JAR := $(full_classes_jar)

$(built_aar): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

$(built_aar): PRIVATE_R_TXT := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/R.txt

$(built_aar) : $(LOCAL_BUILT_MODULE)

$(built_aar) : $(full_classes_jar) $(full_android_manifest)

	@echo "target AAR:  $(PRIVATE_MODULE) ($@)"

	$(hide) rm -rf $(dir $@)aar && mkdir -p $(dir $@)aar/res

	$(hide) cp $(PRIVATE_ANDROID_MANIFEST) $(dir $@)aar/AndroidManifest.xml