Fix Linux and AOSP build (#347)
* Add -Wno-memset-transposed-args to Xerces flags * Fix AOSP
This commit is contained in:
Родитель
4253d38095
Коммит
515da87e6b
|
@ -34,7 +34,7 @@ if(XML_PARSER MATCHES xerces)
|
|||
if(NOT ${XERCES_COMPILE_FLAGS})
|
||||
set(XERCES_COMPILE_FLAGS "")
|
||||
endif()
|
||||
string(APPEND XERCES_COMPILE_FLAGS "-Wno-cast-qual -Wno-unused-parameter -Wno-unused-variable")
|
||||
string(APPEND XERCES_COMPILE_FLAGS "-Wno-cast-qual -Wno-unused-parameter -Wno-unused-variable -Wno-memset-transposed-args")
|
||||
set_target_properties(xerces-c PROPERTIES COMPILE_FLAGS "${XERCES_COMPILE_FLAGS}")
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -23,7 +23,7 @@ usage()
|
|||
echo $'\t' "-sdkver sdk_version Android SDK version. Default/minimum 24."
|
||||
echo $'\t' "-arch arch Architecture ABI. Default x86"
|
||||
echo $'\t' "-b build_type Default MinSizeRel"
|
||||
echo $'\t' "-xzlib Use MSIX SDK Zlib insctead of inbox libz.so"
|
||||
echo $'\t' "-xzlib Use MSIX SDK Zlib instead of inbox libz.so"
|
||||
echo $'\t' "-parser-xerces Use xerces xml parser instead of default javaxml"
|
||||
echo $'\t' "-sb Skip bundle support."
|
||||
echo $'\t' "--validation-parser|-vp Enable XML schema validation."
|
||||
|
|
|
@ -34,19 +34,19 @@ jobs:
|
|||
# TODO: add builds using xerces if needed.
|
||||
matrix:
|
||||
debug_emulator:
|
||||
_arguments: -b Debug
|
||||
_arguments: -b Debug -xzlib
|
||||
_artifact: AOSP-x86chk
|
||||
release_emulator:
|
||||
_arguments: -b MinSizeRel
|
||||
_arguments: -b MinSizeRel -xzlib
|
||||
_artifact: AOSP-x86
|
||||
release_emulator_nobundle:
|
||||
_arguments: -b MinSizeRel -sb
|
||||
_arguments: -b MinSizeRel -sb -xzlib
|
||||
_artifact: AOSP-x86-nobundle
|
||||
release_arm:
|
||||
_arguments: -b MinSizeRel -arch armeabi-v7a
|
||||
_arguments: -b MinSizeRel -arch armeabi-v7a -xzlib
|
||||
_artifact: AOSP-arm
|
||||
release_arm_nobundle:
|
||||
_arguments: -b MinSizeRel -arch armeabi-v7a -sb
|
||||
_arguments: -b MinSizeRel -arch armeabi-v7a -sb -xzlib
|
||||
_artifact: AOSP-arm-nobundle
|
||||
steps:
|
||||
- task: Bash@3
|
||||
|
|
Загрузка…
Ссылка в новой задаче