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

Commit 2dc79b11 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Remove static libraries from Jack classpath 

Those libraries are already imported (or added to the classpath in the
case of the check command) meaning that they were all duplicated.
In addition to complicating the build this was also slowing down the
compilation.

Bug: 28307907
Change-Id: Ia8665e7c5ad8b567bd02de7839fa62e67a5668f7
parent bd0bab23

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ $(call call-jack) \ 
    $(if $(PRIVATE_RMTYPEDEFS), \

        -D jack.android.remove-typedef="true") \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_JACK_SHARED_LIBRARIES)))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    $(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \

    -D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \
@@ -2063,7 +2063,7 @@ $(hide) if [ -s $@.java-source-list-uniq ] ; then \ 
	$(call call-jack) \

	    $(strip $(PRIVATE_JACK_FLAGS)) \

	    $(addprefix --classpath ,$(strip \

	        $(call normalize-path-list,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES)) $(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

	        $(call normalize-path-list,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES)) $(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_JACK_SHARED_LIBRARIES)))) \

	    -D jack.import.resource.policy=keep-first \

	    -D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \

	    -D jack.import.type.policy=keep-first \
@@ -2185,7 +2185,7 @@ $(call call-jack) \ 
    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_JACK_SHARED_LIBRARIES)))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    $(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \

    -D jack.import.resource.policy=keep-first \

core/java_common.mk

+3 −4
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ full_shared_jack_libs := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS 
full_jack_deps := $(full_shared_jack_libs)

endif # USE_CORE_LIB_BOOTCLASSPATH

endif # !LOCAL_IS_HOST_MODULE

full_jack_libs := $(full_shared_jack_libs) $(full_static_jack_libs) $(LOCAL_JACK_CLASSPATH)

full_shared_jack_libs += $(LOCAL_JACK_CLASSPATH)

full_jack_deps += $(full_static_jack_libs) $(LOCAL_JACK_CLASSPATH)



ifndef LOCAL_IS_HOST_MODULE
@@ -377,7 +377,6 @@ ifneq ($(apk_libraries),) 


  # link against the jar with full original names (before proguard processing).

  full_shared_jack_libs += $(link_apk_jack_libraries)

  full_jack_libs += $(link_apk_jack_libraries)

  full_jack_deps += $(link_apk_jack_libraries)

endif
@@ -387,13 +386,13 @@ endif 
ifdef LOCAL_INSTRUMENTATION_FOR

   # link against the jar with full original names (before proguard processing).

   link_instr_classes_jack := $(link_instr_intermediates_dir.COMMON)/classes.noshrob.jack

   full_jack_libs += $(link_instr_classes_jack)

   full_shared_jack_libs += $(link_instr_classes_jack)

   full_jack_deps += $(link_instr_classes_jack)

endif  # LOCAL_INSTRUMENTATION_FOR

endif  # !LOCAL_IS_HOST_MODULE



# Propagate local configuration options to this target.

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JACK_LIBRARIES:= $(full_jack_libs)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JACK_SHARED_LIBRARIES:= $(full_shared_jack_libs)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)



endif  # need_compile_java