Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb5da8e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I1d34e57d,Ia661d6fd

* changes:
  Remove libcutils from fluoride_defaults
  Remove libhidlbase from fluoride_defaults
parents ffa68754 2c88afe5
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ cc_library_shared {
        "libaaudio",
        "libbinder_ndk",
        "libcrypto",
        "libcutils",
        "libfmq",
        "libhidlbase",
        "libnativehelper",
        "libstatssocket",
        "libutils",
+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ cc_test {
        "android.hardware.bluetooth.audio@2.0",
        "android.hardware.bluetooth.audio@2.1",
        "libcrypto",
        "libcutils",
        "liblog",
        "libprotobuf-cpp-lite",
        "libstatssocket",
+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ cc_test {
        "libaaudio",
        "libbinder_ndk",
        "libcrypto",
        "libcutils",
        "libfmq",
        "libhidlbase",
        "libstatssocket",
+0 −4
Original line number Diff line number Diff line
@@ -129,10 +129,6 @@ cc_defaults {
        "libbluetooth_gd",
        "libstatslog_bt",
    ],
    shared_libs: [
        "libcutils",
        "libhidlbase",
    ],
    target: {
        darwin: {
            // libstatslog_bt -> libbinder doesn't build on mac
+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ cc_library_static {
    },
    shared_libs: [
        "libcrypto",
        "libcutils",
    ],
    min_sdk_version: "Tiramisu",
}
Loading