Skip to content

Commit

Permalink
Build Android APK with perfetto native dependency using Blaze.
Browse files Browse the repository at this point in the history
Use 'select' for "-llog" linkopts to make target buildable in googel3.

Bug: b/386353531
Change-Id: Ib9218b6bd9ae0ca8ca7b7f8f026c6b0e939e97dd
  • Loading branch information
Kirill Timofeev committed Jan 20, 2025
1 parent 57b7cc3 commit 789532f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7610,7 +7610,10 @@ perfetto_android_jni_library(
"src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.h",
],
binary_name = "libperfetto_jni_wrapper_lib.so",
linkopts = ["-llog"],
linkopts = select({
"@platforms//os:android": ["-llog"],
"//conditions:default": [],
}),
deps = [
":java_sdk_perfetto_example_lib",
],
Expand Down
5 changes: 4 additions & 1 deletion BUILD.extras
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ perfetto_android_jni_library(
"src/java_sdk/main/cpp/com_google_perfetto_sdk_PerfettoExampleWrapper.h",
],
binary_name = "libperfetto_jni_wrapper_lib.so",
linkopts = ["-llog"],
linkopts = select({
"@platforms//os:android": ["-llog"],
"//conditions:default": [],
}),
deps = [
":java_sdk_perfetto_example_lib",
],
Expand Down

0 comments on commit 789532f

Please sign in to comment.