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

Commit ba2e6728 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Flag: List explicitly the aconfig file" into main

parents 07e147f6 84374acc

flags/Android.bp

+38 −1
Original line number Diff line number Diff line
@@ -7,9 +7,46 @@ aconfig_declarations { 
    name: "bluetooth_aconfig_flags",

    package: "com.android.bluetooth.flags",

    container: "com.android.btservices",

    // LINT.IfChange

    srcs: [

        "**/*.aconfig",

        "a2dp.aconfig",

        "asha.aconfig",

        "audio_routing.aconfig",

        "avrcp.aconfig",

        "avrcp_controller.aconfig",

        "bta_dm.aconfig",

        "btif_dm.aconfig",

        "connectivity.aconfig",

        "device_iot_config.aconfig",

        "did.aconfig",

        "discovery_service.aconfig",

        "dumpsys.aconfig",

        "framework.aconfig",

        "gap.aconfig",

        "hap.aconfig",

        "hfp.aconfig",

        "hid.aconfig",

        "l2cap.aconfig",

        "le_advertising.aconfig",

        "leaudio.aconfig",

        "map.aconfig",

        "mapclient.aconfig",

        "mcp.aconfig",

        "metric.aconfig",

        "opp.aconfig",

        "pairing.aconfig",

        "ranging.aconfig",

        "rfcomm.aconfig",

        "rnr.aconfig",

        "sdp.aconfig",

        "security.aconfig",

        "sniff.aconfig",

        "sockets.aconfig",

        "system_service.aconfig",

        "vcp.aconfig",

        "vsc.aconfig",

    ],

    // LINT.ThenChange(/flags/BUILD.gn)

}



java_aconfig_library {

flags/BUILD.gn

+4 −0
Original line number Diff line number Diff line 
import("//bt/flags/aconfig.gni")



aconfig("bluetooth_flags_c_lib") {

  # LINT.IfChange

  sources = [

    "a2dp.aconfig",

    "asha.aconfig",
@@ -10,6 +11,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "bta_dm.aconfig",

    "btif_dm.aconfig",

    "connectivity.aconfig",

    "device_iot_config.aconfig",

    "did.aconfig",

    "discovery_service.aconfig",

    "dumpsys.aconfig",
@@ -23,6 +25,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "leaudio.aconfig",

    "map.aconfig",

    "mapclient.aconfig",

    "mcp.aconfig",

    "metric.aconfig",

    "opp.aconfig",

    "pairing.aconfig",
@@ -37,6 +40,7 @@ aconfig("bluetooth_flags_c_lib") { 
    "vcp.aconfig",

    "vsc.aconfig",

  ]

  # LINT.ThenChange(/flags/Android.bp)

  package = "com.android.bluetooth.flags"

  deps = [ "//bt/floss/libflags:libflags" ]

}