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

Commit f23d7779 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Add dependencies on java resources when packaging APK without classes" am: 9d2219c2 am: 6109d42e am: a3577076

Original change: https://android-review.googlesource.com/c/platform/build/+/1549235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48e9ae7374fd587d4441ccce77cf29b534c87320
parents e46c97a9 a3577076

core/package_internal.mk

+6 −0
Original line number Diff line number Diff line
@@ -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)