p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add dependencies on java resources when packaging APK without classes"

This commit is contained in:
Treehugger Robot 2021-01-13 00:57:08 +00:00 committed by Gerrit Code Review
parent 2de3459680 9644ec811f
commit 9d2219c2da
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/package_internal.mk
View File

@ -552,6 +552,10 @@ endif
ifeq (true, $(LOCAL_UNCOMPRESS_DEX))
$(LOCAL_BUILT_MODULE) : $(ZIP2ZIP)
endif
ifeq ($(full_classes_jar),)
# We don't build jar, need to add the Java resources here.
$(LOCAL_BUILT_MODULE): $(java_resource_sources)
endif
$(LOCAL_BUILT_MODULE): PRIVATE_USE_EMBEDDED_NATIVE_LIBS := $(LOCAL_USE_EMBEDDED_NATIVE_LIBS)
$(LOCAL_BUILT_MODULE):
@echo "target Package: $(PRIVATE_MODULE) ($@)"
@ -603,6 +607,8 @@ ifneq ($(full_classes_jar),)
else
$(my_bundle_module): PRIVATE_DEX_FILE :=
$(my_bundle_module): PRIVATE_SOURCE_ARCHIVE :=
# We don't build jar, need to add the Java resources here.
$(my_bundle_module): $(java_resource_sources)
endif # full_classes_jar
$(my_bundle_module): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP)