openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Fix turbine classpath arguments in Make" 

am: 9c28a4a15c

Change-Id: I53fbdd3ed3bc1f363c5cca56c1cea9516d362cff
This commit is contained in:
Colin Cross 2019-11-08 07:23:16 -08:00 committed by android-build-merger
parent aa0cbb18fa 9c28a4a15c
commit 607dabf75b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/definitions.mk
View File

@ -2101,10 +2101,10 @@ $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) -o -n "$(PRIVATE_SRCJARS)" ] ; then
--javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \ --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \
$(if $(PRIVATE_USE_SYSTEM_MODULES), \ $(if $(PRIVATE_USE_SYSTEM_MODULES), \
--system $(PRIVATE_SYSTEM_MODULES_DIR), \ --system $(PRIVATE_SYSTEM_MODULES_DIR), \
$(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH)))) \ --bootclasspath $(strip $(PRIVATE_BOOTCLASSPATH))) \
$(addprefix --classpath ,$(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \ --classpath $(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \
$(filter-out $(PRIVATE_SYSTEM_MODULES_LIBS),$(PRIVATE_BOOTCLASSPATH))) \ $(filter-out $(PRIVATE_SYSTEM_MODULES_LIBS),$(PRIVATE_BOOTCLASSPATH))) \
$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \ $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \
|| ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \ || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \
$(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $@.premerged $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \ $(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $@.premerged $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \
else \ else \