Skip to content

Commit

Permalink
fix(ndk): link directly to liblog without find_library to avoid inclu…
Browse files Browse the repository at this point in the history
…ding it in the aar files built on Linux (#1263)
  • Loading branch information
lemnik authored May 25, 2021
1 parent 42c84a4 commit a79738e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 18 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
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
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
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

0 comments on commit a79738e

Please sign in to comment.