diff options
author | Steve Kim <kwstephenkim@google.com> | 2020-04-11 00:09:55 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-11 00:09:55 +0000 |
commit | d96f9d3752d3c6a1741284b9053b9f8fe489d6b2 (patch) | |
tree | 5ed74cb47b326202941f3f42067060d40330cc9f | |
parent | acea896534d2c232efa0a755b0fbae54acdaa22a (diff) | |
parent | a3c5f0d2256ccc2f7578d683854989d746bda20a (diff) | |
download | libwebsockets-d96f9d3752d3c6a1741284b9053b9f8fe489d6b2.tar.gz |
libsockets header generation resolves dependency automatically am: 4e3c3e59be am: de34424465 am: e1d6ff8d39 am: e31daa0cd4 am: a3c5f0d225
Change-Id: I143c09085ef0c7349e8d17a0e978fbc5c477b3c2
-rwxr-xr-x | gen_lws_config_h.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gen_lws_config_h.sh b/gen_lws_config_h.sh index 9d8d6d52..c7cc6833 100755 --- a/gen_lws_config_h.sh +++ b/gen_lws_config_h.sh @@ -62,18 +62,34 @@ function sed_in_cmake_android() { sed -i "s/$from/$to/g" $cmake_android_file } +function build_prerequisites() { + local modules=("$@") + ( + pushd ${ANDROID_ROOTDIR} + source ${ANDROID_ROOTDIR}/build/envsetup.sh + for mod in "${modules[@]}"; do + mmm $mod + done + popd + ) +} + function create_android_list() { # # by filling out the form in CMAKE_ANDROID_FILE_TEMPLATE, # create CMAKE_ANDROID_FILE that is included in CMakeLists.txt # - # The CMAKE_ANDROID_FILE defines libray/include directories for + # The CMAKE_ANDROID_FILE defines library/include directories for # libraries provided by somewhere in Android Root # rm -f ${CMAKE_ANDROID_FILE} || true cp -f ${CMAKE_ANDROID_FILE_TEMPLATE} ${CMAKE_ANDROID_FILE} sed_in_cmake_android "android_src_root_dir" ${ANDROID_ROOTDIR} ${CMAKE_ANDROID_FILE} - libs=("libssl" "libcrypto" "libcap") + # libraries that libwebsockets would depend on + local libs=("libssl" "libcrypto" "libcap") + # Android components that provide the "libs" above + local components=("external/boringssl" "external/libcap") + build_prerequisites "${components[@]}" for lib in ${libs[@]}; do local libfile_path=$(find_lib_path $lib) local libpath=$(dirname ${libfile_path}) @@ -83,8 +99,6 @@ function create_android_list() { done } -# build required modules ahead by installing & build fake_module - # create CMakeAndroidLists.txt create_android_list |