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

Commit 9d087694 authored Mar 06, 2018 by Treehugger Robot Committed by Gerrit Code Review Mar 06, 2018

Merge "Fix the incorrect turbine flag."

parents 8d36d4b8 78c19aa9

core/soong_app_prebuilt.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,13 +34,13 @@ ifdef LOCAL_SOONG_PROGUARD_DICT
		$(intermediates.COMMON)/proguard_dictionary)
		endif

		ifneq ($(TURBINE_DISABLED),false)
		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_DISABLED != false
		endif # TURBINE_ENABLED != false


		$(eval $(call copy-one-file,$(LOCAL_PREBUILT_MODULE_FILE),$(LOCAL_BUILT_MODULE)))

core/soong_java_prebuilt.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,13 +39,13 @@ ifdef LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR
		$(intermediates.COMMON)/jacoco-report-classes.jar)
		endif

		ifneq ($(TURBINE_DISABLED),false)
		ifneq ($(TURBINE_ENABLED),false)
		ifdef LOCAL_SOONG_HEADER_JAR
		$(eval $(call copy-one-file,$(LOCAL_SOONG_HEADER_JAR),$(full_classes_header_jar)))
		else
		$(eval $(call copy-one-file,$(full_classes_jar),$(full_classes_header_jar)))
		endif
		endif # TURBINE_DISABLED != false
		endif # TURBINE_ENABLED != false

		ifdef LOCAL_SOONG_DEX_JAR
		ifndef LOCAL_IS_HOST_MODULE