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

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

Merge "Format Android.bp files touched by storage" into main

parents a06003c5 424fd512

system/device/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ cc_library_static { 
    header_libs: ["libbluetooth_headers"],

    static_libs: [

        "bluetooth_flags_c_lib",

        "libaconfig_storage_read_api_cc",

        "libbluetooth_hci_pdl",

        "libbluetooth_log",

        "libbt_shim_bridge",

        "libflatbuffers-cpp",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

}
@@ -96,10 +96,10 @@ cc_test { 
        "test/device_iot_config_test.cc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libdl",

        "liblog",

        "libaconfig_storage_read_api_cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

system/device/fuzzer/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ cc_fuzz { 
        "libbluetooth_headers",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libdl",

        "liblog",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

system/gd/Android.bp

+5 −5
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ cc_defaults { 
        "libbluetooth_smp_pdl",

    ],

    static_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-protos",
@@ -184,7 +185,6 @@ cc_defaults { 
        "libcom.android.sysprop.bluetooth.wrapped",

        "libosi",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    include_dirs: [

        "packages/modules/Bluetooth/system/include",
@@ -331,6 +331,7 @@ cc_binary { 
        "libosi",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libgrpc++",
@@ -339,7 +340,6 @@ cc_binary { 
        "libprotobuf-cpp-full",

        "libunwindstack",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    target: {

        android: {
@@ -506,9 +506,9 @@ cc_test { 
    ],

    shared_libs: [

        "libPlatformProperties",

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    sanitize: {

        address: true,
@@ -548,6 +548,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysTestData_h",

    ],

    static_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys-test",
@@ -568,7 +569,6 @@ cc_test { 
        "liblog",

        "libosi",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    shared_libs: [

        "libcrypto",
@@ -658,13 +658,13 @@ cc_defaults { 
    ],

    shared_libs: [

        "libPlatformProperties",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libcrypto",

        "libgrpc++",

        "libgrpc_wrap",

        "liblog",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    cflags: [

        "-DFUZZ_TARGET",

system/gd/rust/topshim/facade/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -77,13 +77,13 @@ rust_defaults { 
        "libudrv-uipc",

    ],

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "libcutils",

        "libgrpc++",

        "libgrpc_wrap",

        "liblog",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    proc_macros: [

        "libpaste",

system/main/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -226,10 +226,10 @@ cc_test { 
    ],

    shared_libs: [

        "libPlatformProperties",

        "libaconfig_storage_read_api_cc",

        "libbinder_ndk",

        "libcrypto",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    sanitize: {

        address: true,
@@ -310,9 +310,9 @@ cc_test { 
    ],

    shared_libs: [

        "libPlatformProperties",

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "server_configurable_flags",

        "libaconfig_storage_read_api_cc",

    ],

    target: {

        linux: {