diff options
| author | 2024-05-08 06:05:23 +0000 | |
|---|---|---|
| committer | 2024-05-08 06:05:23 +0000 | |
| commit | ba2e67285bf8d6e30fc779ae82f4bca606241ca8 (patch) | |
| tree | 0bd67b938ad362ca048e7b286a9ccb25cb8ad7d4 | |
| parent | 07e147f66725350043003fb07e43c0423f1b28bf (diff) | |
| parent | 84374accf25a85af8ab63cb446e8a68067aaea7f (diff) | |
Merge "Flag: List explicitly the aconfig file" into main
| -rw-r--r-- | flags/Android.bp | 39 | ||||
| -rw-r--r-- | flags/BUILD.gn | 4 |
2 files changed, 42 insertions, 1 deletions
diff --git a/flags/Android.bp b/flags/Android.bp index 536173d496..a49f41c09c 100644 --- a/flags/Android.bp +++ b/flags/Android.bp @@ -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 { diff --git a/flags/BUILD.gn b/flags/BUILD.gn index 8c362e2f4e..fac7192224 100644 --- a/flags/BUILD.gn +++ b/flags/BUILD.gn @@ -1,6 +1,7 @@ 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" ] } |