StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow disabling turbine

Browse Source 
m -j TURBINE_ENABLED=false will build without turbine.  This is
primarily useful for A/B comparisions of turbine builds, but will
also be used to temporarily disable turbine for unbundled builds
until we have turbine prebuilts.

Bug: 64308460
Test: m -j TURBINE_ENABLED=false java
Test: m -j java
Change-Id: Ie48746c8bfc60c361be9634cb1805ca1c09aa1fe
This commit is contained in:
Colin Cross
2017-09-26 16:17:24 -07:00
parent 9b2e4c6950
commit 7dc9043546
7 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java_common.mk
View File

@@ -300,7 +300,11 @@ ifdef LOCAL_INSTRUMENTATION_FOR
APPS,$(LOCAL_INSTRUMENTATION_FOR),,COMMON)
# link against the jar with full original names (before proguard processing).
link_instr_classes_jar := $(link_instr_intermediates_dir.COMMON)/classes-pre-proguard.jar
link_instr_classes_header_jar := $(link_instr_intermediates_dir.COMMON)/classes-header.jar
ifneq ($(TURBINE_ENABLED),false)
link_instr_classes_header_jar := $(link_instr_intermediates_dir.COMMON)/classes-header.jar
else
link_instr_classes_header_jar := $(link_instr_intermediates_dir.COMMON)/classes.jar
endif
full_java_libs += $(link_instr_classes_jar)
full_java_header_libs += $(link_instr_classes_header_jar)
endif # LOCAL_INSTRUMENTATION_FOR