Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: support android build on ndk version equal or above 23(Android… #31521

Closed
wants to merge 7 commits into from
Closed

build: support android build on ndk version equal or above 23(Android… #31521

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2981fb4
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 26, 2020
0a185c7
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 26, 2020
eebc6bc
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 27, 2020
93d6de1
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 29, 2020
0dac234
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 29, 2020
fdd4cfc
build: support android build on ndk version equal or above 23(Android…
forfun414 Jan 29, 2020
a4aedd4
build: support android build on ndk version equal or above 23(Android…
forfun414 Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build: support android build on ndk version equal or above 23(Android… 
… 6.0)

merge linux and android into one conditon
  • Loading branch information
@forfun414
forfun414 committed Jan 29, 2020
commit 93d6de1318ae36b2c227053b1c06e644e552d21f
8 changes: 2 additions & 6 deletions deps/openssl/openssl-cl_no_asm.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,9 @@
'includes': ['config/archs/linux-ppc64/no-asm/openssl-cl.gypi'],
}, 'target_arch=="s390x" and OS=="linux"', {
'includes': ['config/archs/linux64-s390x/no-asm/openssl-cl.gypi'],
}, 'target_arch=="arm" and OS=="linux"', {
}, 'target_arch=="arm" and OS in "linux android"', {
'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
}, 'target_arch=="arm64" and OS=="linux"', {
'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'],
}, 'target_arch=="arm" and OS=="android"', {
'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
}, 'target_arch=="arm64" and OS=="android"', {
}, 'target_arch=="arm64" and OS in "linux android"', {
'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'],
}, 'target_arch=="arm64" and OS=="win"', {
'includes': ['config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi'],
Expand Down