From f7693eed97bc5fd7d70dc5f7d035626dd7ea8afb Mon Sep 17 00:00:00 2001 From: Zhuoyao Zhang Date: Thu, 16 Feb 2017 14:58:55 -0800 Subject: [PATCH] Update the test binary and source file name. * To confirm with Vts naming convention. Bug: 35273456 Test: mma Change-Id: Ide6d9d15618e65d8cb74363f3a8acd52609cd0dd --- bluetooth/1.0/vts/functional/Android.bp | 4 ++-- ...{bluetooth_hidl_hal_test.cpp => VtsHalBluetoothV1_0TargetTest.cpp} | 0 ir/1.0/vts/functional/Android.bp | 4 ++-- .../functional/{ir_hidl_hal_test.cpp => VtsHalIrV1_0TargetTest.cpp} | 0 nfc/1.0/vts/functional/Android.bp | 4 ++-- .../functional/{nfc_hidl_hal_test.cpp => VtsHalNfcV1_0TargetTest.cpp} | 0 radio/1.0/vts/functional/Android.bp | 4 ++-- .../{radio_hidl_hal_main.cpp => VtsHalRadioV1_0TargetTest.cpp} | 0 wifi/1.0/vts/functional/Android.bp | 4 ++-- wifi/1.0/vts/functional/{main.cpp => VtsHalWifiV1_0TargetTest.cpp} | 0 wifi/supplicant/1.0/vts/functional/Android.mk | 4 ++-- .../functional/{main.cpp => VtsHalWifiSupplicantV1_0TargetTest.cpp} | 0 12 files changed, 12 insertions(+), 12 deletions(-) rename bluetooth/1.0/vts/functional/{bluetooth_hidl_hal_test.cpp => VtsHalBluetoothV1_0TargetTest.cpp} (100%) rename ir/1.0/vts/functional/{ir_hidl_hal_test.cpp => VtsHalIrV1_0TargetTest.cpp} (100%) rename nfc/1.0/vts/functional/{nfc_hidl_hal_test.cpp => VtsHalNfcV1_0TargetTest.cpp} (100%) rename radio/1.0/vts/functional/{radio_hidl_hal_main.cpp => VtsHalRadioV1_0TargetTest.cpp} (100%) rename wifi/1.0/vts/functional/{main.cpp => VtsHalWifiV1_0TargetTest.cpp} (100%) rename wifi/supplicant/1.0/vts/functional/{main.cpp => VtsHalWifiSupplicantV1_0TargetTest.cpp} (100%) diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index 086ac99b..2012c20c 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -15,9 +15,9 @@ // cc_test { - name: "bluetooth_hidl_hal_test", + name: "VtsHalBluetoothV1_0TargetTest", gtest: true, - srcs: ["bluetooth_hidl_hal_test.cpp"], + srcs: ["VtsHalBluetoothV1_0TargetTest.cpp"], shared_libs: [ "libbase", "liblog", diff --git a/bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp similarity index 100% rename from bluetooth/1.0/vts/functional/bluetooth_hidl_hal_test.cpp rename to bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index 1acd2a0e..56894745 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -15,9 +15,9 @@ // cc_test { - name: "ir_hidl_hal_test", + name: "VtsHalIrV1_0TargetTest", gtest: true, - srcs: ["ir_hidl_hal_test.cpp"], + srcs: ["VtsHalIrV1_0TargetTest.cpp"], shared_libs: [ "libbase", "liblog", diff --git a/ir/1.0/vts/functional/ir_hidl_hal_test.cpp b/ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp similarity index 100% rename from ir/1.0/vts/functional/ir_hidl_hal_test.cpp rename to ir/1.0/vts/functional/VtsHalIrV1_0TargetTest.cpp diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index 0f9eb3d3..080887fb 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -15,9 +15,9 @@ // cc_test { - name: "nfc_hidl_hal_test", + name: "VtsHalNfcV1_0TargetTest", gtest: true, - srcs: ["nfc_hidl_hal_test.cpp"], + srcs: ["VtsHalNfcV1_0TargetTest.cpp"], shared_libs: [ "libbase", "liblog", diff --git a/nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp b/nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp similarity index 100% rename from nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp rename to nfc/1.0/vts/functional/VtsHalNfcV1_0TargetTest.cpp diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index a01e270d..6615f03f 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -15,12 +15,12 @@ // cc_test { - name: "radio_hidl_hal_test", + name: "VtsHalRadioV1_0TargetTest", gtest: true, srcs: ["radio_hidl_hal_test.cpp", "radio_response.cpp", "radio_hidl_hal_icc.cpp", - "radio_hidl_hal_main.cpp"], + "VtsHalRadioV1_0TargetTest.cpp"], shared_libs: [ "libbase", "liblog", diff --git a/radio/1.0/vts/functional/radio_hidl_hal_main.cpp b/radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp similarity index 100% rename from radio/1.0/vts/functional/radio_hidl_hal_main.cpp rename to radio/1.0/vts/functional/VtsHalRadioV1_0TargetTest.cpp diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 8a5d7e0a..01eeef59 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -15,10 +15,10 @@ // cc_test { - name: "wifi_hidl_test", + name: "VtsHalWifiV1_0TargetTest", gtest: true, srcs: [ - "main.cpp", + "VtsHalWifiV1_0TargetTest.cpp", "wifi_ap_iface_hidl_test.cpp", "wifi_chip_hidl_test.cpp", "wifi_hidl_call_util_selftest.cpp", diff --git a/wifi/1.0/vts/functional/main.cpp b/wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp similarity index 100% rename from wifi/1.0/vts/functional/main.cpp rename to wifi/1.0/vts/functional/VtsHalWifiV1_0TargetTest.cpp diff --git a/wifi/supplicant/1.0/vts/functional/Android.mk b/wifi/supplicant/1.0/vts/functional/Android.mk index 8fa649f0..52fecc25 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.mk +++ b/wifi/supplicant/1.0/vts/functional/Android.mk @@ -16,10 +16,10 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := supplicant_hidl_test +LOCAL_MODULE := VtsHalWifiSupplicantV1_0TargetTest LOCAL_CPPFLAGS := -Wall -Werror -Wextra LOCAL_SRC_FILES := \ - main.cpp \ + VtsHalWifiSupplicantV1_0TargetTest.cpp \ supplicant_hidl_test.cpp \ supplicant_hidl_test_utils.cpp \ supplicant_p2p_iface_hidl_test.cpp \ diff --git a/wifi/supplicant/1.0/vts/functional/main.cpp b/wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp similarity index 100% rename from wifi/supplicant/1.0/vts/functional/main.cpp rename to wifi/supplicant/1.0/vts/functional/VtsHalWifiSupplicantV1_0TargetTest.cpp -- 2.11.0