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

fix(ndk): link directly to liblog without find_library #1263

Merged
merged 1 commit into from
May 25, 2021
Merged

fix(ndk): link directly to liblog without find_library #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

* NDK: lowMemory attribute is now reported as expected
[1262](https://github.com/bugsnag/bugsnag-android/pull/1262)

* Don't include loglog.so in ndk plugin builds performed on Linux
[1263](https://github.com/bugsnag/bugsnag-android/pull/1263)

## 5.9.3 (2021-05-18)

Expand Down
9 changes: 1 addition & 8 deletions bugsnag-plugin-android-anr/src/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,10 @@ add_library( # Specifies the name of the library.

include_directories(jni)

find_library( # Defines the name of the path variable that stores the
# location of the NDK library.
log-lib
# Specifies the name of the NDK library that
# CMake needs to locate.
log )

target_link_libraries( # Specifies the target library.
bugsnag-plugin-android-anr
# Links the log library to the target library.
${log-lib})
log)

set_target_properties(bugsnag-plugin-android-anr
PROPERTIES
Expand Down
11 changes: 1 addition & 10 deletions bugsnag-plugin-android-ndk/src/main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,10 @@ include_directories(

target_include_directories(bugsnag-ndk PRIVATE ${BUGSNAG_DIR}/assets/include)

find_library( # Defines the name of the path variable that stores the
# location of the NDK library.
log-lib

# Specifies the name of the NDK library that
# CMake needs to locate.
log )

target_link_libraries( # Specifies the target library.
bugsnag-ndk

# Links the log library to the target library.
${log-lib})
log)

set_target_properties(bugsnag-ndk
PROPERTIES
Expand Down