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

Merge changes I06179fca,Ie48746c8,Ia47ebc95

Browse Source 
* changes:
  Disable turbine for unbundled builds
  Allow disabling turbine
  Simplify the *-lib-* functions
This commit is contained in:
Treehugger Robot
2017-09-27 02:36:24 +00:00
committed by Gerrit Code Review
parent 96a782f1ea 5601842176
commit b182ea7bcb
8 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java.mk
View File

@@ -499,6 +499,8 @@ $(full_classes_compiled_jar): \
| $(SOONG_JAVAC_WRAPPER)
$(transform-java-to-classes.jar)
ifneq ($(TURBINE_ENABLED),false)
$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)
$(full_classes_turbine_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
$(full_classes_turbine_jar): \
@@ -527,6 +529,8 @@ endif
$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))
endif # TURBINE_ENABLED != false
javac-check : $(full_classes_compiled_jar)
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)