From 41ca2fd21e531512252284b7357e7f4c92690f15 Mon Sep 17 00:00:00 2001 From: Rambo Wang Date: Thu, 18 Feb 2021 18:39:04 -0800 Subject: [PATCH] Format all Android.bp files with bpfmt to pass bpfmt buildin hook bpfmt buildin hook (introduced in aosp/295130) will refuse us to upload patch if any functional change made in those Android.bp files. To separate formatting change from functional change, all those Android.bp files are formatted here with command below: find hardware/interfaces/radio/ -name Android.bp -exec bpfmt -w {} \; Bug: 180649021 Test: atest VtsHalRadioV1_0TargetTest VtsHalRadioV1_1TargetTest VtsHalRadioV1_2TargetTest VtsHalRadioV1_3TargetTest VtsHalRadioV1_4TargetTest VtsHalRadioV1_5TargetTest Change-Id: Iab8620bc1bd5035c03b693f836a115d9f688ce1d --- radio/1.0/vts/functional/Android.bp | 54 +++++++++++++--------- radio/1.1/vts/functional/Android.bp | 17 ++++--- radio/1.2/vts/functional/Android.bp | 5 +- radio/1.3/vts/functional/Android.bp | 5 +- radio/1.4/vts/functional/Android.bp | 5 +- radio/1.5/vts/functional/Android.bp | 5 +- radio/config/1.0/vts/functional/Android.bp | 5 +- radio/config/1.1/vts/functional/Android.bp | 5 +- radio/config/1.2/vts/functional/Android.bp | 5 +- 9 files changed, 71 insertions(+), 35 deletions(-) diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 13fc5425ac..9946c31a2f 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -17,46 +17,56 @@ cc_test { name: "VtsHalRadioV1_0TargetTest", defaults: ["VtsHalTargetTestDefaults"], - srcs: ["radio_hidl_hal_cell_broadcast.cpp", - "radio_hidl_hal_data.cpp", - "radio_hidl_hal_icc.cpp", - "radio_hidl_hal_ims.cpp", - "radio_hidl_hal_misc.cpp", - "radio_hidl_hal_sms.cpp", - "radio_hidl_hal_stk.cpp", - "radio_hidl_hal_test.cpp", - "radio_hidl_hal_voice.cpp", - "radio_indication.cpp", - "radio_response.cpp", - "VtsHalRadioV1_0TargetTest.cpp", - "vts_test_util.cpp"], + srcs: [ + "radio_hidl_hal_cell_broadcast.cpp", + "radio_hidl_hal_data.cpp", + "radio_hidl_hal_icc.cpp", + "radio_hidl_hal_ims.cpp", + "radio_hidl_hal_misc.cpp", + "radio_hidl_hal_sms.cpp", + "radio_hidl_hal_stk.cpp", + "radio_hidl_hal_test.cpp", + "radio_hidl_hal_voice.cpp", + "radio_indication.cpp", + "radio_response.cpp", + "VtsHalRadioV1_0TargetTest.cpp", + "vts_test_util.cpp", + ], static_libs: [ "android.hardware.radio@1.0", ], test_config: "vts_hal_radio_target_test.xml", - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } cc_test { name: "VtsHalSapV1_0TargetTest", defaults: ["VtsHalTargetTestDefaults"], - srcs: ["sap_callback.cpp", - "sap_hidl_hal_api.cpp", - "sap_hidl_hal_test.cpp", - "VtsHalSapV1_0TargetTest.cpp", - "vts_test_util.cpp"], + srcs: [ + "sap_callback.cpp", + "sap_hidl_hal_api.cpp", + "sap_hidl_hal_test.cpp", + "VtsHalSapV1_0TargetTest.cpp", + "vts_test_util.cpp", + ], static_libs: [ "android.hardware.radio@1.0", ], test_config: "vts_hal_sap_target_test.xml", - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } cc_library_static { name: "RadioVtsTestUtilBase", defaults: ["VtsHalTargetTestDefaults"], - srcs : [ - "vts_test_util.cpp" + srcs: [ + "vts_test_util.cpp", ], shared_libs: [ "android.hardware.radio@1.0", diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp index e1278b926a..b6a69065db 100644 --- a/radio/1.1/vts/functional/Android.bp +++ b/radio/1.1/vts/functional/Android.bp @@ -17,11 +17,13 @@ cc_test { name: "VtsHalRadioV1_1TargetTest", defaults: ["VtsHalTargetTestDefaults"], - srcs: ["radio_hidl_hal_api.cpp", - "radio_hidl_hal_test.cpp", - "radio_indication.cpp", - "radio_response.cpp", - "VtsHalRadioV1_1TargetTest.cpp"], + srcs: [ + "radio_hidl_hal_api.cpp", + "radio_hidl_hal_test.cpp", + "radio_indication.cpp", + "radio_response.cpp", + "VtsHalRadioV1_1TargetTest.cpp", + ], static_libs: [ "RadioVtsTestUtilBase", "android.hardware.radio@1.1", @@ -30,5 +32,8 @@ cc_test { header_libs: [ "radio.util.header@1.0", ], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/1.2/vts/functional/Android.bp b/radio/1.2/vts/functional/Android.bp index 56f2d5fb49..9254e34d07 100644 --- a/radio/1.2/vts/functional/Android.bp +++ b/radio/1.2/vts/functional/Android.bp @@ -34,5 +34,8 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/1.3/vts/functional/Android.bp b/radio/1.3/vts/functional/Android.bp index e32258f5d3..386e1e8997 100644 --- a/radio/1.3/vts/functional/Android.bp +++ b/radio/1.3/vts/functional/Android.bp @@ -32,5 +32,8 @@ cc_test { "android.hardware.radio@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/1.4/vts/functional/Android.bp b/radio/1.4/vts/functional/Android.bp index 369b55b7a2..61995f891a 100644 --- a/radio/1.4/vts/functional/Android.bp +++ b/radio/1.4/vts/functional/Android.bp @@ -35,5 +35,8 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"] + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/1.5/vts/functional/Android.bp b/radio/1.5/vts/functional/Android.bp index cd54d274fd..906ee0796b 100644 --- a/radio/1.5/vts/functional/Android.bp +++ b/radio/1.5/vts/functional/Android.bp @@ -36,5 +36,8 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"] + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/config/1.0/vts/functional/Android.bp b/radio/config/1.0/vts/functional/Android.bp index 330209eed0..59ef27499c 100644 --- a/radio/config/1.0/vts/functional/Android.bp +++ b/radio/config/1.0/vts/functional/Android.bp @@ -29,5 +29,8 @@ cc_test { "android.hardware.radio.config@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/config/1.1/vts/functional/Android.bp b/radio/config/1.1/vts/functional/Android.bp index f60331d1c3..f366fcaed0 100644 --- a/radio/config/1.1/vts/functional/Android.bp +++ b/radio/config/1.1/vts/functional/Android.bp @@ -29,5 +29,8 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], } diff --git a/radio/config/1.2/vts/functional/Android.bp b/radio/config/1.2/vts/functional/Android.bp index fdc83b73fc..25c45a02e3 100644 --- a/radio/config/1.2/vts/functional/Android.bp +++ b/radio/config/1.2/vts/functional/Android.bp @@ -31,5 +31,8 @@ cc_test { "android.hardware.radio.config@1.2", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts"], + test_suites: [ + "general-tests", + "vts", + ], }