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

Commit 40e4abf0 authored by Dennis Shen's avatar Dennis Shen
Browse files

use new aconfig storage read api instead of server_configurable_flags 

Bug: b/321077378
Test: m and avd
Flag: build.RELEASE_READ_FROM_NEW_STORAGE, com.android.providers.settings.storage_test_mission_1
Change-Id: I8abb57211d4dfa725785b10371f2b10c3b3587ca
parent 3ac3486a

android/app/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -101,6 +101,7 @@ cc_library_shared { 
        "lib-bt-packets-avrcp",

        "lib-bt-packets-avrcp",

        "lib-bt-packets-base",

        "lib-bt-packets-base",

        "libFraunhoferAAC",

        "libFraunhoferAAC",

        "libaconfig_storage_read_api_cc",

        "libaudio-a2dp-hw-utils",

        "libaudio-a2dp-hw-utils",

        "libbase",

        "libbase",

        "libbluetooth",

        "libbluetooth",
@@ -164,6 +165,7 @@ cc_library_shared { 
        "com.android.btservices",

        "com.android.btservices",

    ],

    ],

    min_sdk_version: "Tiramisu",

    min_sdk_version: "Tiramisu",

    ldflags: ["-Wl,--allow-multiple-definition"],

}

}





cc_library {

cc_library {

system/audio/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ cc_library_static { 
        "libbluetooth_headers",

        "libbluetooth_headers",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libchrome",

        "libchrome",

        "liblog",

        "liblog",

        "server_configurable_flags",

        "server_configurable_flags",
@@ -67,6 +68,7 @@ cc_library_host_shared { 
        "libbluetooth_headers",

        "libbluetooth_headers",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "server_configurable_flags",

        "server_configurable_flags",

    ],

    ],

    static_libs: [

    static_libs: [

system/audio_hal_interface/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,7 @@ cc_test { 
        "aidl/a2dp_provider_info_unittest.cc",

        "aidl/a2dp_provider_info_unittest.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbinder_ndk",

        "libbinder_ndk",

        "libcutils",

        "libcutils",

        "libhidlbase",

        "libhidlbase",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ cc_defaults { 
    shared_libs: [

    shared_libs: [

        "libPlatformProperties",

        "libPlatformProperties",

        "libaaudio",

        "libaaudio",

        "libaconfig_storage_read_api_cc",

        "libbinder_ndk",

        "libbinder_ndk",

        "libcrypto",

        "libcrypto",

        "libfmq",

        "libfmq",

system/bta/Android.bp

+11 −0
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ cc_library_static { 
    static_libs: [

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib",

        "lib-bt-packets",

        "lib-bt-packets",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libbluetooth_hci_pdl",

        "libbluetooth_hci_pdl",

        "libbluetooth_log",

        "libbluetooth_log",
@@ -288,6 +289,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libcrypto",

        "libcrypto",

        "libcutils",

        "libcutils",

        "libhidlbase",

        "libhidlbase",
@@ -302,6 +304,7 @@ cc_test { 
        "android.hardware.common-V2-ndk",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libbluetooth-types",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_crypto_toolbox",
@@ -377,6 +380,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "liblog",

        "liblog",
@@ -422,6 +426,7 @@ cc_test { 
        "test/bta_hf_client_security_test.cc",

        "test/bta_hf_client_security_test.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "libcutils",

        "libcutils",
@@ -484,6 +489,7 @@ cc_test { 
        "test/bta_rfcomm_scn_test.cc",

        "test/bta_rfcomm_scn_test.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "libcutils",

        "libcutils",
@@ -551,6 +557,7 @@ cc_test { 
        "test/common/btm_api_mock.cc",

        "test/common/btm_api_mock.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "liblog",

        "liblog",
@@ -919,6 +926,7 @@ cc_test { 
        "LeAudioSetConfigSchemas_h",

        "LeAudioSetConfigSchemas_h",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "libhidlbase",

        "libhidlbase",
@@ -1004,6 +1012,7 @@ cc_test { 
        "test/common/mock_device_groups.cc",

        "test/common/mock_device_groups.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "libhidlbase",

        "libhidlbase",
@@ -1308,6 +1317,7 @@ cc_test { 
        "test/bta_hh_test.cc",

        "test/bta_hh_test.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "liblog",

        "liblog",
@@ -1379,6 +1389,7 @@ cc_test { 
        "test/bta_jv_test.cc",

        "test/bta_jv_test.cc",

    ],

    ],

    shared_libs: [

    shared_libs: [

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbase",

        "libcrypto",

        "libcrypto",

        "liblog",

        "liblog",