From 0005c8d067af65c18e432a639db7de64e8755873 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Sat, 3 Jun 2023 18:22:47 +0000
Subject: [PATCH] Remove liblog from fluoride_defaults_fuzzable
Test: mma
Bug: 279502784
Change-Id: Ia3d3f63073ae72fb85cd713c85574b1526c60d85
---
android/app/Android.bp | 1 +
system/bta/Android.bp | 7 +++++++
system/btif/Android.bp | 3 +++
system/build/Android.bp | 3 ---
system/common/Android.bp | 1 +
system/packet/Android.bp | 1 +
system/packet/tests/fuzzers/Android.bp | 25 +++++++++++++++++++++++++
system/profile/sdp/Android.bp | 1 +
system/stack/Android.bp | 10 ++++++++++
system/types/Android.bp | 1 +
10 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/android/app/Android.bp b/android/app/Android.bp
index c05562f219f..d9856d397c5 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -115,6 +115,7 @@ cc_library_shared {
"libcutils",
"libfmq",
"libhidlbase",
+ "liblog",
"libnativehelper",
"libstatssocket",
"libutils",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 9e612c5255f..62a53cfa9b3 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -441,6 +441,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"crypto_toolbox_for_tests",
@@ -484,6 +485,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"crypto_toolbox_for_tests",
@@ -538,6 +540,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"crypto_toolbox_for_tests",
@@ -844,6 +847,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"libbt-common",
@@ -906,6 +910,7 @@ cc_test {
"libcrypto",
"libfmq",
"libhidlbase",
+ "liblog",
],
static_libs: [
"libbt-audio-hal-interface",
@@ -966,6 +971,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"crypto_toolbox_for_tests",
@@ -1031,6 +1037,7 @@ cc_test {
],
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"crypto_toolbox_for_tests",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index a8850a5314c..e7f7d9feeb8 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -265,6 +265,7 @@ cc_test {
"libcutils",
"libfmq",
"libhidlbase",
+ "liblog",
"libstatssocket",
"libutils",
],
@@ -347,6 +348,7 @@ cc_test {
"libosi",
],
cflags: ["-DBUILDCFG"],
+ shared_libs: ["liblog"],
}
// btif avrcp audio track unit tests
@@ -379,6 +381,7 @@ cc_test {
"libosi",
],
cflags: ["-DBUILDCFG"],
+ shared_libs: ["liblog"],
}
// btif rc unit tests for target
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 1b69f4a23c5..1c806f37b25 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -71,9 +71,6 @@ cc_defaults {
"libbt_shim_bridge",
"libbt_shim_ffi",
],
- shared_libs: [
- "liblog",
- ],
cpp_std: "c++17",
min_sdk_version: "current",
}
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 0f463106062..3c6a803dca7 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -81,6 +81,7 @@ cc_test {
},
shared_libs: [
"libcrypto",
+ "liblog",
],
static_libs: [
"libbt-common",
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 2b806673287..7b4bce1e471 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -73,6 +73,7 @@ cc_test {
"libbase",
"libbinder_ndk",
"libcrypto",
+ "liblog",
],
static_libs: [
"lib-bt-packets",
diff --git a/system/packet/tests/fuzzers/Android.bp b/system/packet/tests/fuzzers/Android.bp
index ef196019eb1..a1f24ac94d1 100644
--- a/system/packet/tests/fuzzers/Android.bp
+++ b/system/packet/tests/fuzzers/Android.bp
@@ -37,6 +37,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -70,6 +71,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -103,6 +105,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -136,6 +139,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -169,6 +173,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -202,6 +207,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -235,6 +241,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -268,6 +275,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -301,6 +309,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -334,6 +343,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -367,6 +377,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -400,6 +411,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -433,6 +445,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -466,6 +479,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -499,6 +513,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -532,6 +547,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -565,6 +581,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -598,6 +615,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -631,6 +649,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -664,6 +683,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -697,6 +717,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -730,6 +751,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -763,6 +785,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -796,6 +819,7 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
cc_fuzz {
@@ -829,4 +853,5 @@ cc_fuzz {
cflags: [
"-DBUILDCFG",
],
+ shared_libs: ["liblog"],
}
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index 8bc5e1d1d0e..b9efc1600c4 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -49,4 +49,5 @@ cc_test {
"libgmock",
"sdp_service",
],
+ shared_libs: ["liblog"],
}
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index da944404bab..5d4b19d4b91 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -24,6 +24,7 @@ cc_test_library {
],
shared_libs: [
"libcutils",
+ "liblog",
],
srcs: crypto_toolbox_srcs,
}
@@ -145,6 +146,9 @@ cc_library_static {
"libldacBT_abr",
"libldacBT_enc",
],
+ apex_available: [
+ "com.android.btservices",
+ ],
host_supported: true,
min_sdk_version: "Tiramisu",
}
@@ -293,6 +297,9 @@ cc_library_static {
"libPlatformProperties",
"libcrypto",
],
+ apex_available: [
+ "com.android.btservices",
+ ],
host_supported: true,
min_sdk_version: "Tiramisu",
}
@@ -320,6 +327,9 @@ cc_defaults {
static_libs: [
"libchrome",
],
+ shared_libs: [
+ "liblog",
+ ],
target: {
darwin: {
enabled: false,
diff --git a/system/types/Android.bp b/system/types/Android.bp
index ba908c9f6c7..c8c280b43d3 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -79,4 +79,5 @@ cc_test {
"test/class_of_device_unittest.cc",
"test/raw_address_unittest.cc",
],
+ shared_libs: ["liblog"],
}
--
GitLab