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

Commit 4c3f7f08 authored Mar 19, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Mar 19, 2018

Merge "Fix the incorrect turbine flag." into pi-dev

parents dc3806d9 af578824

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