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

Commit b182ea7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I06179fca,Ie48746c8,Ia47ebc95 

* changes:
  Disable turbine for unbundled builds
  Allow disabling turbine
  Simplify the *-lib-* functions
parents 96a782f1 56018421

core/combo/javac.mk

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ ifndef ANDROID_COMPILE_WITH_JACK 
    endif

endif



ifdef TARGET_BUILD_APPS

  ifndef TURBINE_ENABLED

    TURBINE_ENABLED := false

  endif

endif



ifeq ($(OVERRIDE_ANDROID_JAVA_HOME),)

ANDROID_JAVA_HOME := prebuilts/jdk/jdk8/$(HOST_PREBUILT_TAG)

else

core/definitions.mk

+28 −22
Original line number Diff line number Diff line
@@ -671,34 +671,27 @@ endef 
## $(2): Non-empty if IS_HOST_MODULE

###########################################################



# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _java-lib-dir

$(call intermediates-dir-for, \

	JAVA_LIBRARIES,$(1),$(2),COMMON)

endef



# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _java-lib-full-classes.jar

$(call _java-lib-dir,$(1),$(2))/classes.jar

endef



# Get the jar files (you can pass to "javac -classpath") of static or shared

# Java libraries that you want to link against.

# $(1): library name list

# $(2): Non-empty if IS_HOST_MODULE

define java-lib-files

$(foreach lib,$(1),$(call _java-lib-full-classes.jar,$(lib),$(2)))

$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),$(2),COMMON)/classes.jar)

endef



# Get the header jar files (you can pass to "javac -classpath") of static or shared

# Java libraries that you want to link against.

# $(1): library name list

# $(2): Non-empty if IS_HOST_MODULE

ifneq ($(TURBINE_ENABLED),false)

define java-lib-header-files

$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),$(2),COMMON)/classes-header.jar)

endef

else

define java-lib-header-files

$(call java-lib-files,$(1),$(2))

endef

endif



# Get the dependency files (you can put on the right side of "|" of a build rule)

# of the Java libraries.
@@ -712,6 +705,25 @@ define java-lib-deps 
$(call java-lib-files,$(1),$(2))

endef



# Get the jar files (you can pass to "javac -classpath") of static or shared

# APK libraries that you want to link against.

# $(1): library name list

define app-lib-files

$(foreach lib,$(1),$(call intermediates-dir-for,APPS,$(lib),,COMMON)/classes.jar)

endef



# Get the header jar files (you can pass to "javac -classpath") of static or shared

# APK libraries that you want to link against.

# $(1): library name list

ifneq ($(TURBINE_ENABLED),false)

define app-lib-header-files

$(foreach lib,$(1),$(call intermediates-dir-for,APPS,$(lib),,COMMON)/classes-header.jar)

endef

else

define app-lib-header-files

$(call app-lib-files,$(1))

endef

endif



###########################################################

## Convert "core ext framework" to "out/.../classes.jack ..."
@@ -719,16 +731,10 @@ endef 
## $(2): Non-empty if IS_HOST_MODULE

###########################################################



# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _jack-lib-full-classes

$(call _java-lib-dir,$(1),$(2))/classes.jack

endef



# $(1): library name list

# $(2): Non-empty if IS_HOST_MODULE

define jack-lib-files

$(foreach lib,$(1),$(call _jack-lib-full-classes,$(lib),$(2)))

$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),$(2),COMMON)/classes.jack)

endef



###########################################################

core/host_dalvik_java_library.mk

+4 −0
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ $(full_classes_compiled_jar): \ 
    | $(SOONG_JAVAC_WRAPPER)

	$(transform-host-java-to-dalvik-package)



ifneq ($(TURBINE_ENABLED),false)



$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_turbine_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)

$(full_classes_turbine_jar): \
@@ -147,6 +149,8 @@ endif 


$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))



endif # TURBINE_ENABLED != false



$(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)

$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

core/host_java_library.mk

+2 −0
Original line number Diff line number Diff line
@@ -122,4 +122,6 @@ include $(BUILD_SYSTEM)/jacoco.mk 
$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(LOCAL_BUILT_MODULE)))

$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_jar)))



ifneq ($(TURBINE_DISABLED),false)

$(eval $(call copy-one-file,$(LOCAL_FULL_CLASSES_JACOCO_JAR),$(full_classes_header_jar)))

endif

core/java.mk

+4 −0
Original line number Diff line number Diff line
@@ -499,6 +499,8 @@ $(full_classes_compiled_jar): \ 
    | $(SOONG_JAVAC_WRAPPER)

	$(transform-java-to-classes.jar)



ifneq ($(TURBINE_ENABLED),false)



$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_turbine_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)

$(full_classes_turbine_jar): \
@@ -527,6 +529,8 @@ endif 


$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))



endif # TURBINE_ENABLED != false



javac-check : $(full_classes_compiled_jar)

javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)