Skip to content

Commit

Permalink
zlib: fix discovery of cpu-features.h for android
Browse files Browse the repository at this point in the history
Fixed cpu-features.h not found issue.

Co-Authored-By: Luigi Pinca <[email protected]>
Fixes: #49766
PR-URL: #49828
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
  • Loading branch information
2 people authored and targos committed Nov 11, 2023
1 parent d9eda67 commit f564ed4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions android_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def patch_android():
GYP_DEFINES += " v8_target_arch=" + arch
GYP_DEFINES += " android_target_arch=" + arch
GYP_DEFINES += " host_os=" + host_os + " OS=android"
GYP_DEFINES += " android_ndk_path=" + android_ndk_path
os.environ['GYP_DEFINES'] = GYP_DEFINES

if os.path.exists("./configure"):
Expand Down
2 changes: 1 addition & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
],
},],
['OS == "android"', {
'cflags': [ '-fPIC' ],
'cflags': [ '-fPIC', '-I<(android_ndk_path)/sources/android/cpufeatures' ],
'ldflags': [ '-fPIC' ]
}],
],
Expand Down

0 comments on commit f564ed4

Please sign in to comment.