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

Commit af578824 authored Mar 05, 2018 by Nan Zhang Committed by Arthur Hsu Mar 19, 2018

Fix the incorrect turbine flag.

Bug: 74831968
Test: m -j java TURBINE_ENABLED=false
Change-Id: Id6ca380c97bbcd3731c815e37513b7e949cccdfb
(cherry picked from commit 78c19aa9)
Merged-In: Id6ca380c97bbcd3731c815e37513b7e949cccdfb

parent bb4986c6

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