From 78c19aa9ef01539f38746d020196e427aaea92ec Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Mon, 5 Mar 2018 13:35:45 -0800 Subject: [PATCH] Fix the incorrect turbine flag. Test: m -j java TURBINE_ENABLED=false Change-Id: Id6ca380c97bbcd3731c815e37513b7e949cccdfb --- core/soong_app_prebuilt.mk | 4 ++-- core/soong_java_prebuilt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk index c553c4c41..4c3421532 100644 --- a/core/soong_app_prebuilt.mk +++ b/core/soong_app_prebuilt.mk @@ -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))) diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk index 22425822b..7d32e4857 100644 --- a/core/soong_java_prebuilt.mk +++ b/core/soong_java_prebuilt.mk @@ -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