Rename all *.cpp files to *.cc to follow new style

Change-Id: Ia79ee09348e67ff4a1712ee11a1e8480180a2623

109 files changed, 189 insertions, 174 deletions

diff --git a/system/btcore/Android.mk b/system/btcore/Android.mk
index 1366997919..3550312ad6 100644
--- a/system/btcore/Android.mk
+++ b/system/btcore/Android.mk
@@ -30,11 +30,11 @@ btcoreCommonSrc := \
     src/uuid.c
 
 btcoreCommonTestSrc := \
-    ./test/bdaddr_test.cpp \
-    ./test/device_class_test.cpp \
-    ./test/property_test.cpp \
-    ./test/uuid_test.cpp \
-    ../osi/test/AllocationTestHarness.cpp
+    ./test/bdaddr_test.cc \
+    ./test/device_class_test.cc \
+    ./test/property_test.cc \
+    ./test/uuid_test.cc \
+    ../osi/test/AllocationTestHarness.cc
 
 btcoreCommonIncludes := \
     $(LOCAL_PATH)/include \
@@ -83,6 +83,7 @@ endif
 # libbtcore unit tests for target
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btcoreCommonIncludes)
 LOCAL_SRC_FILES := $(btcoreCommonTestSrc)
 LOCAL_MODULE := net_test_btcore
@@ -100,6 +101,7 @@ include $(BUILD_NATIVE_TEST)
 # ========================================================
 ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btcoreCommonIncludes)
 LOCAL_SRC_FILES := $(btcoreCommonTestSrc)
 LOCAL_MODULE := net_test_btcore
diff --git a/system/btcore/BUILD.gn b/system/btcore/BUILD.gn
index a961d8df40..a0df578a31 100644
--- a/system/btcore/BUILD.gn
+++ b/system/btcore/BUILD.gn
@@ -34,11 +34,11 @@ static_library("btcore") {
 executable("net_test_btcore") {
   testonly = true
   sources = [
-    "test/bdaddr_test.cpp",
-    "test/device_class_test.cpp",
-    "test/property_test.cpp",
-    "test/uuid_test.cpp",
-    "//osi/test/AllocationTestHarness.cpp",
+    "test/bdaddr_test.cc",
+    "test/device_class_test.cc",
+    "test/property_test.cc",
+    "test/uuid_test.cc",
+    "//osi/test/AllocationTestHarness.cc",
   ]
 
   include_dirs = [
diff --git a/system/btcore/test/bdaddr_test.cpp b/system/btcore/test/bdaddr_test.cc
index 1e7918e22a..1e7918e22a 100644
--- a/system/btcore/test/bdaddr_test.cpp
+++ b/system/btcore/test/bdaddr_test.cc
diff --git a/system/btcore/test/device_class_test.cpp b/system/btcore/test/device_class_test.cc
index c3098a2f77..c3098a2f77 100644
--- a/system/btcore/test/device_class_test.cpp
+++ b/system/btcore/test/device_class_test.cc
diff --git a/system/btcore/test/property_test.cpp b/system/btcore/test/property_test.cc
index 8032e97347..8032e97347 100644
--- a/system/btcore/test/property_test.cpp
+++ b/system/btcore/test/property_test.cc
diff --git a/system/btcore/test/uuid_test.cpp b/system/btcore/test/uuid_test.cc
index 7b3e788161..7b3e788161 100644
--- a/system/btcore/test/uuid_test.cpp
+++ b/system/btcore/test/uuid_test.cc
diff --git a/system/device/Android.mk b/system/device/Android.mk
index c5b9377ca7..94d3222266 100644
--- a/system/device/Android.mk
+++ b/system/device/Android.mk
@@ -50,15 +50,15 @@ include $(BUILD_STATIC_LIBRARY)
 # Bluetooth device unit tests for target
 # ========================================================
 include $(CLEAR_VARS)
-
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/.. \
     $(bluetooth_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
-    ../osi/test/AllocationTestHarness.cpp \
-    ./test/interop_test.cpp \
-    ./test/classic/peer_test.cpp
+    ../osi/test/AllocationTestHarness.cc \
+    ./test/interop_test.cc \
+    ./test/classic/peer_test.cc
 
 LOCAL_MODULE := net_test_device
 LOCAL_MODULE_TAGS := tests
diff --git a/system/device/BUILD.gn b/system/device/BUILD.gn
index bfc42ec966..fbe8f886df 100644
--- a/system/device/BUILD.gn
+++ b/system/device/BUILD.gn
@@ -33,8 +33,8 @@ static_library("device") {
 executable("net_test_device") {
   testonly = true
   sources = [
-    "//osi/test/AllocationTestHarness.cpp",
-    "test/classic/peer_test.cpp",
+    "//osi/test/AllocationTestHarness.cc",
+    "test/classic/peer_test.cc",
   ]
 
   include_dirs = [ "//" ]
diff --git a/system/device/test/classic/peer_test.cpp b/system/device/test/classic/peer_test.cc
index 9f8b9ac4b2..9f8b9ac4b2 100644
--- a/system/device/test/classic/peer_test.cpp
+++ b/system/device/test/classic/peer_test.cc
diff --git a/system/device/test/interop_test.cpp b/system/device/test/interop_test.cc
index ef4f1c514b..ef4f1c514b 100644
--- a/system/device/test/interop_test.cpp
+++ b/system/device/test/interop_test.cc
diff --git a/system/hci/Android.mk b/system/hci/Android.mk
index 24e3d4d289..b083f00c89 100644
--- a/system/hci/Android.mk
+++ b/system/hci/Android.mk
@@ -46,6 +46,7 @@ include $(BUILD_STATIC_LIBRARY)
 # ========================================================
 ifeq (,$(strip $(SANITIZE_TARGET)))
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
@@ -58,13 +59,13 @@ LOCAL_C_INCLUDES := \
     $(bluetooth_C_INCLUDES)
 
 LOCAL_SRC_FILES := \
-    ../osi/test/AllocationTestHarness.cpp \
-    ../osi/test/AlarmTestHarness.cpp \
-    ./test/hci_hal_h4_test.cpp \
-    ./test/hci_hal_mct_test.cpp \
-    ./test/hci_layer_test.cpp \
-    ./test/low_power_manager_test.cpp \
-    ./test/packet_fragmenter_test.cpp
+    ../osi/test/AllocationTestHarness.cc \
+    ../osi/test/AlarmTestHarness.cc \
+    ./test/hci_hal_h4_test.cc \
+    ./test/hci_hal_mct_test.cc \
+    ./test/hci_layer_test.cc \
+    ./test/low_power_manager_test.cc \
+    ./test/packet_fragmenter_test.cc
 
 LOCAL_MODULE := net_test_hci
 LOCAL_MODULE_TAGS := tests
diff --git a/system/hci/BUILD.gn b/system/hci/BUILD.gn
index 35a0b78055..a99021c14b 100644
--- a/system/hci/BUILD.gn
+++ b/system/hci/BUILD.gn
@@ -46,13 +46,13 @@ static_library("hci") {
 executable("net_test_hci") {
   testonly = true
   sources = [
-    "//osi/test/AllocationTestHarness.cpp",
-    "//osi/test/AlarmTestHarness.cpp",
-    "test/hci_hal_h4_test.cpp",
-    "test/hci_hal_mct_test.cpp",
-    "test/hci_layer_test.cpp",
-    "test/low_power_manager_test.cpp",
-    "test/packet_fragmenter_test.cpp",
+    "//osi/test/AllocationTestHarness.cc",
+    "//osi/test/AlarmTestHarness.cc",
+    "test/hci_hal_h4_test.cc",
+    "test/hci_hal_mct_test.cc",
+    "test/hci_layer_test.cc",
+    "test/low_power_manager_test.cc",
+    "test/packet_fragmenter_test.cc",
   ]
 
   include_dirs = [
diff --git a/system/hci/test/hci_hal_h4_test.cpp b/system/hci/test/hci_hal_h4_test.cc
index bf6240519b..bf6240519b 100644
--- a/system/hci/test/hci_hal_h4_test.cpp
+++ b/system/hci/test/hci_hal_h4_test.cc
diff --git a/system/hci/test/hci_hal_mct_test.cpp b/system/hci/test/hci_hal_mct_test.cc
index f40f323b8f..f40f323b8f 100644
--- a/system/hci/test/hci_hal_mct_test.cpp
+++ b/system/hci/test/hci_hal_mct_test.cc
diff --git a/system/hci/test/hci_layer_test.cpp b/system/hci/test/hci_layer_test.cc
index f6b23f2833..f6b23f2833 100644
--- a/system/hci/test/hci_layer_test.cpp
+++ b/system/hci/test/hci_layer_test.cc
diff --git a/system/hci/test/low_power_manager_test.cpp b/system/hci/test/low_power_manager_test.cc
index 0cc76fa5b0..0cc76fa5b0 100644
--- a/system/hci/test/low_power_manager_test.cpp
+++ b/system/hci/test/low_power_manager_test.cc
diff --git a/system/hci/test/packet_fragmenter_test.cpp b/system/hci/test/packet_fragmenter_test.cc
index 2924fe9329..2924fe9329 100644
--- a/system/hci/test/packet_fragmenter_test.cpp
+++ b/system/hci/test/packet_fragmenter_test.cc
diff --git a/system/osi/Android.mk b/system/osi/Android.mk
index 60d0c845fb..0b19f57717 100644
--- a/system/osi/Android.mk
+++ b/system/osi/Android.mk
@@ -39,7 +39,7 @@ btosiCommonSrc := \
     ./src/hash_map.c \
     ./src/hash_map_utils.c \
     ./src/list.c \
-    ./src/metrics.cpp \
+    ./src/metrics.cc \
     ./src/mutex.c \
     ./src/osi.c \
     ./src/properties.c \
@@ -54,27 +54,27 @@ btosiCommonSrc := \
     ./src/wakelock.c
 
 btosiCommonTestSrc := \
-    ./test/AlarmTestHarness.cpp \
-    ./test/AllocationTestHarness.cpp \
-    ./test/alarm_test.cpp \
-    ./test/allocation_tracker_test.cpp \
-    ./test/allocator_test.cpp \
-    ./test/array_test.cpp \
-    ./test/config_test.cpp \
-    ./test/data_dispatcher_test.cpp \
-    ./test/eager_reader_test.cpp \
-    ./test/fixed_queue_test.cpp \
-    ./test/future_test.cpp \
-    ./test/hash_map_test.cpp \
-    ./test/hash_map_utils_test.cpp \
-    ./test/list_test.cpp \
-    ./test/properties_test.cpp \
-    ./test/rand_test.cpp \
-    ./test/reactor_test.cpp \
-    ./test/ringbuffer_test.cpp \
-    ./test/semaphore_test.cpp \
-    ./test/thread_test.cpp \
-    ./test/time_test.cpp
+    ./test/AlarmTestHarness.cc \
+    ./test/AllocationTestHarness.cc \
+    ./test/alarm_test.cc \
+    ./test/allocation_tracker_test.cc \
+    ./test/allocator_test.cc \
+    ./test/array_test.cc \
+    ./test/config_test.cc \
+    ./test/data_dispatcher_test.cc \
+    ./test/eager_reader_test.cc \
+    ./test/fixed_queue_test.cc \
+    ./test/future_test.cc \
+    ./test/hash_map_test.cc \
+    ./test/hash_map_utils_test.cc \
+    ./test/list_test.cc \
+    ./test/properties_test.cc \
+    ./test/rand_test.cc \
+    ./test/reactor_test.cc \
+    ./test/ringbuffer_test.cc \
+    ./test/semaphore_test.cc \
+    ./test/thread_test.cc \
+    ./test/time_test.cc
 
 btosiCommonIncludes := \
     $(LOCAL_PATH)/.. \
@@ -85,6 +85,7 @@ btosiCommonIncludes := \
 # Bluetooth Protobuf static library for target
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := libbt-protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 generated_sources_dir := $(call local-generated-sources-dir)
@@ -101,6 +102,7 @@ include $(BUILD_STATIC_LIBRARY)
 # Bluetooth Protobuf static library for host
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := libbt-protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_IS_HOST_MODULE := true
@@ -118,6 +120,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
 # libosi static library for target
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btosiCommonIncludes)
 LOCAL_SRC_FILES := $(btosiCommonSrc)
 LOCAL_MODULE := libosi
@@ -136,6 +139,7 @@ include $(BUILD_STATIC_LIBRARY)
 # ========================================================
 ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btosiCommonIncludes)
 LOCAL_SRC_FILES := $(btosiCommonSrc)
 LOCAL_MODULE := libosi-host
@@ -161,6 +165,7 @@ endif
 # libosi unit tests for target
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btosiCommonIncludes)
 LOCAL_SRC_FILES := $(btosiCommonTestSrc)
 LOCAL_MODULE := net_test_osi
@@ -178,6 +183,7 @@ include $(BUILD_NATIVE_TEST)
 # ========================================================
 ifeq ($(HOST_OS),linux)
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_C_INCLUDES := $(btosiCommonIncludes)
 LOCAL_SRC_FILES := $(btosiCommonTestSrc)
 LOCAL_LDLIBS := -lrt -lpthread
diff --git a/system/osi/BUILD.gn b/system/osi/BUILD.gn
index ed91fb1cd2..abb2fa8d3e 100644
--- a/system/osi/BUILD.gn
+++ b/system/osi/BUILD.gn
@@ -31,7 +31,7 @@ static_library("osi") {
     "src/hash_map.c",
     "src/hash_map_utils.c",
     "src/list.c",
-    "src/metrics_linux.cpp",
+    "src/metrics_linux.cc",
     "src/mutex.c",
     "src/osi.c",
     "src/properties.c",
@@ -59,25 +59,25 @@ static_library("osi") {
 executable("net_test_osi") {
   testonly = true
   sources = [
-    "test/AlarmTestHarness.cpp",
-    "test/AllocationTestHarness.cpp",
-    "test/alarm_test.cpp",
-    "test/allocation_tracker_test.cpp",
-    "test/allocator_test.cpp",
-    "test/array_test.cpp",
-    "test/config_test.cpp",
-    "test/data_dispatcher_test.cpp",
-    "test/eager_reader_test.cpp",
-    "test/future_test.cpp",
-    "test/hash_map_test.cpp",
-    "test/hash_map_utils_test.cpp",
-    "test/list_test.cpp",
-    "test/properties_test.cpp",
-    "test/rand_test.cpp",
-    "test/reactor_test.cpp",
-    "test/ringbuffer_test.cpp",
-    "test/thread_test.cpp",
-    "test/time_test.cpp",
+    "test/AlarmTestHarness.cc",
+    "test/AllocationTestHarness.cc",
+    "test/alarm_test.cc",
+    "test/allocation_tracker_test.cc",
+    "test/allocator_test.cc",
+    "test/array_test.cc",
+    "test/config_test.cc",
+    "test/data_dispatcher_test.cc",
+    "test/eager_reader_test.cc",
+    "test/future_test.cc",
+    "test/hash_map_test.cc",
+    "test/hash_map_utils_test.cc",
+    "test/list_test.cc",
+    "test/properties_test.cc",
+    "test/rand_test.cc",
+    "test/reactor_test.cc",
+    "test/ringbuffer_test.cc",
+    "test/thread_test.cc",
+    "test/time_test.cc",
   ]
 
   include_dirs = [
diff --git a/system/osi/src/metrics.cpp b/system/osi/src/metrics.cc
index a99200b050..a99200b050 100644
--- a/system/osi/src/metrics.cpp
+++ b/system/osi/src/metrics.cc
diff --git a/system/osi/src/metrics_linux.cpp b/system/osi/src/metrics_linux.cc
index f01323617b..f01323617b 100644
--- a/system/osi/src/metrics_linux.cpp
+++ b/system/osi/src/metrics_linux.cc
diff --git a/system/osi/test/AlarmTestHarness.cpp b/system/osi/test/AlarmTestHarness.cc
index 32fde6dc76..32fde6dc76 100644
--- a/system/osi/test/AlarmTestHarness.cpp
+++ b/system/osi/test/AlarmTestHarness.cc
diff --git a/system/osi/test/AllocationTestHarness.cpp b/system/osi/test/AllocationTestHarness.cc
index 0132c738db..0132c738db 100644
--- a/system/osi/test/AllocationTestHarness.cpp
+++ b/system/osi/test/AllocationTestHarness.cc
diff --git a/system/osi/test/alarm_test.cpp b/system/osi/test/alarm_test.cc
index 4ef5805b0a..4ef5805b0a 100644
--- a/system/osi/test/alarm_test.cpp
+++ b/system/osi/test/alarm_test.cc
diff --git a/system/osi/test/allocation_tracker_test.cpp b/system/osi/test/allocation_tracker_test.cc
index ab5f61f302..ab5f61f302 100644
--- a/system/osi/test/allocation_tracker_test.cpp
+++ b/system/osi/test/allocation_tracker_test.cc
diff --git a/system/osi/test/allocator_test.cpp b/system/osi/test/allocator_test.cc
index 19c175b88b..19c175b88b 100644
--- a/system/osi/test/allocator_test.cpp
+++ b/system/osi/test/allocator_test.cc
diff --git a/system/osi/test/array_test.cpp b/system/osi/test/array_test.cc
index 9cd40dcdf7..9cd40dcdf7 100644
--- a/system/osi/test/array_test.cpp
+++ b/system/osi/test/array_test.cc
diff --git a/system/osi/test/config_test.cpp b/system/osi/test/config_test.cc
index 0fb2fe12c1..0fb2fe12c1 100644
--- a/system/osi/test/config_test.cpp
+++ b/system/osi/test/config_test.cc
diff --git a/system/osi/test/data_dispatcher_test.cpp b/system/osi/test/data_dispatcher_test.cc
index 98354bc7c3..98354bc7c3 100644
--- a/system/osi/test/data_dispatcher_test.cpp
+++ b/system/osi/test/data_dispatcher_test.cc
diff --git a/system/osi/test/eager_reader_test.cpp b/system/osi/test/eager_reader_test.cc
index 7156d56f36..7156d56f36 100644
--- a/system/osi/test/eager_reader_test.cpp
+++ b/system/osi/test/eager_reader_test.cc
diff --git a/system/osi/test/fixed_queue_test.cpp b/system/osi/test/fixed_queue_test.cc
index da7cf5cb18..da7cf5cb18 100644
--- a/system/osi/test/fixed_queue_test.cpp
+++ b/system/osi/test/fixed_queue_test.cc
diff --git a/system/osi/test/future_test.cpp b/system/osi/test/future_test.cc
index a7a11af4cc..a7a11af4cc 100644
--- a/system/osi/test/future_test.cpp
+++ b/system/osi/test/future_test.cc
diff --git a/system/osi/test/hash_map_test.cpp b/system/osi/test/hash_map_test.cc
index 92dae16803..92dae16803 100644
--- a/system/osi/test/hash_map_test.cpp
+++ b/system/osi/test/hash_map_test.cc
diff --git a/system/osi/test/hash_map_utils_test.cpp b/system/osi/test/hash_map_utils_test.cc
index fa3ff07c90..fa3ff07c90 100644
--- a/system/osi/test/hash_map_utils_test.cpp
+++ b/system/osi/test/hash_map_utils_test.cc
diff --git a/system/osi/test/list_test.cpp b/system/osi/test/list_test.cc
index b7d8ae889b..b7d8ae889b 100644
--- a/system/osi/test/list_test.cpp
+++ b/system/osi/test/list_test.cc
diff --git a/system/osi/test/properties_test.cpp b/system/osi/test/properties_test.cc
index 3d2752610e..3d2752610e 100644
--- a/system/osi/test/properties_test.cpp
+++ b/system/osi/test/properties_test.cc
diff --git a/system/osi/test/rand_test.cpp b/system/osi/test/rand_test.cc
index cf0d7f6ed0..cf0d7f6ed0 100644
--- a/system/osi/test/rand_test.cpp
+++ b/system/osi/test/rand_test.cc
diff --git a/system/osi/test/reactor_test.cpp b/system/osi/test/reactor_test.cc
index a2c7b6e416..a2c7b6e416 100644
--- a/system/osi/test/reactor_test.cpp
+++ b/system/osi/test/reactor_test.cc
diff --git a/system/osi/test/ringbuffer_test.cpp b/system/osi/test/ringbuffer_test.cc
index 8dd5bdc4e6..8dd5bdc4e6 100644
--- a/system/osi/test/ringbuffer_test.cpp
+++ b/system/osi/test/ringbuffer_test.cc
diff --git a/system/osi/test/semaphore_test.cpp b/system/osi/test/semaphore_test.cc
index c30dd0bce7..c30dd0bce7 100644
--- a/system/osi/test/semaphore_test.cpp
+++ b/system/osi/test/semaphore_test.cc
diff --git a/system/osi/test/thread_test.cpp b/system/osi/test/thread_test.cc
index b45365dad5..b45365dad5 100644
--- a/system/osi/test/thread_test.cpp
+++ b/system/osi/test/thread_test.cc
diff --git a/system/osi/test/time_test.cpp b/system/osi/test/time_test.cc
index e2059f05f1..e2059f05f1 100644
--- a/system/osi/test/time_test.cpp
+++ b/system/osi/test/time_test.cc
diff --git a/system/service/Android.mk b/system/service/Android.mk
index 31d1ed32f6..06cabcf605 100644
--- a/system/service/Android.mk
+++ b/system/service/Android.mk
@@ -39,16 +39,16 @@ endif
 # Source variables
 # ========================================================
 btserviceCommonSrc := \
-	common/bluetooth/adapter_state.cpp \
-	common/bluetooth/advertise_data.cpp \
-	common/bluetooth/advertise_settings.cpp \
-	common/bluetooth/gatt_identifier.cpp \
-	common/bluetooth/scan_filter.cpp \
-	common/bluetooth/scan_result.cpp \
-	common/bluetooth/scan_settings.cpp \
-	common/bluetooth/util/address_helper.cpp \
-	common/bluetooth/util/atomic_string.cpp \
-	common/bluetooth/uuid.cpp
+	common/bluetooth/adapter_state.cc \
+	common/bluetooth/advertise_data.cc \
+	common/bluetooth/advertise_settings.cc \
+	common/bluetooth/gatt_identifier.cc \
+	common/bluetooth/scan_filter.cc \
+	common/bluetooth/scan_result.cc \
+	common/bluetooth/scan_settings.cc \
+	common/bluetooth/util/address_helper.cc \
+	common/bluetooth/util/atomic_string.cc \
+	common/bluetooth/uuid.cc
 
 btserviceCommonBinderSrc := \
 	common/android/bluetooth/IBluetooth.aidl \
@@ -59,44 +59,44 @@ btserviceCommonBinderSrc := \
 	common/android/bluetooth/IBluetoothGattServerCallback.aidl \
 	common/android/bluetooth/IBluetoothLowEnergy.aidl \
 	common/android/bluetooth/IBluetoothLowEnergyCallback.aidl \
-	common/android/bluetooth/advertise_data.cpp \
-	common/android/bluetooth/advertise_settings.cpp \
-	common/android/bluetooth/gatt_identifier.cpp \
-	common/android/bluetooth/scan_filter.cpp \
-	common/android/bluetooth/scan_result.cpp \
-	common/android/bluetooth/scan_settings.cpp \
-	common/android/bluetooth/uuid.cpp \
+	common/android/bluetooth/advertise_data.cc \
+	common/android/bluetooth/advertise_settings.cc \
+	common/android/bluetooth/gatt_identifier.cc \
+	common/android/bluetooth/scan_filter.cc \
+	common/android/bluetooth/scan_result.cc \
+	common/android/bluetooth/scan_settings.cc \
+	common/android/bluetooth/uuid.cc \
 
 btserviceCommonAidlInclude := \
 	packages/modules/Bluetooth/system/service/common \
 	frameworks/native/aidl/binder
 
 btserviceDaemonSrc := \
-	adapter.cpp \
-	daemon.cpp \
-	gatt_client.cpp \
-	gatt_server.cpp \
-	gatt_server_old.cpp \
-	hal/gatt_helpers.cpp \
-	hal/bluetooth_gatt_interface.cpp \
-	hal/bluetooth_interface.cpp \
-	ipc/ipc_handler.cpp \
-	ipc/ipc_manager.cpp \
-	logging_helpers.cpp \
-	low_energy_client.cpp \
-	settings.cpp
+	adapter.cc \
+	daemon.cc \
+	gatt_client.cc \
+	gatt_server.cc \
+	gatt_server_old.cc \
+	hal/gatt_helpers.cc \
+	hal/bluetooth_gatt_interface.cc \
+	hal/bluetooth_interface.cc \
+	ipc/ipc_handler.cc \
+	ipc/ipc_manager.cc \
+	logging_helpers.cc \
+	low_energy_client.cc \
+	settings.cc
 
 btserviceLinuxSrc := \
-	ipc/ipc_handler_linux.cpp \
-	ipc/linux_ipc_host.cpp
+	ipc/ipc_handler_linux.cc \
+	ipc/linux_ipc_host.cc
 
 btserviceBinderDaemonImplSrc := \
-	ipc/binder/bluetooth_binder_server.cpp \
-	ipc/binder/bluetooth_gatt_client_binder_server.cpp \
-	ipc/binder/bluetooth_gatt_server_binder_server.cpp \
-	ipc/binder/bluetooth_low_energy_binder_server.cpp \
-	ipc/binder/interface_with_instances_base.cpp \
-	ipc/binder/ipc_handler_binder.cpp \
+	ipc/binder/bluetooth_binder_server.cc \
+	ipc/binder/bluetooth_gatt_client_binder_server.cc \
+	ipc/binder/bluetooth_gatt_server_binder_server.cc \
+	ipc/binder/bluetooth_low_energy_binder_server.cc \
+	ipc/binder/interface_with_instances_base.cc \
+	ipc/binder/ipc_handler_binder.cc \
 
 btserviceBinderDaemonSrc := \
 	$(btserviceCommonBinderSrc) \
@@ -109,28 +109,29 @@ btserviceCommonIncludes := \
 # Main unit test sources. These get built for host and target.
 # ========================================================
 btserviceBaseTestSrc := \
-	hal/fake_bluetooth_gatt_interface.cpp \
-	hal/fake_bluetooth_interface.cpp \
-	test/adapter_unittest.cpp \
-	test/advertise_data_unittest.cpp \
-	test/fake_hal_util.cpp \
-	test/gatt_client_unittest.cpp \
-	test/gatt_identifier_unittest.cpp \
-	test/gatt_server_unittest.cpp \
-	test/low_energy_client_unittest.cpp \
-	test/settings_unittest.cpp \
-	test/util_unittest.cpp \
-	test/uuid_unittest.cpp
+	hal/fake_bluetooth_gatt_interface.cc \
+	hal/fake_bluetooth_interface.cc \
+	test/adapter_unittest.cc \
+	test/advertise_data_unittest.cc \
+	test/fake_hal_util.cc \
+	test/gatt_client_unittest.cc \
+	test/gatt_identifier_unittest.cc \
+	test/gatt_server_unittest.cc \
+	test/low_energy_client_unittest.cc \
+	test/settings_unittest.cc \
+	test/util_unittest.cc \
+	test/uuid_unittest.cc
 
 # Native system service for target
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
 	$(btserviceCommonSrc) \
 	$(btserviceBinderDaemonSrc) \
 	$(btserviceLinuxSrc) \
 	$(btserviceDaemonSrc) \
-	main.cpp
+	main.cc
 LOCAL_AIDL_INCLUDES = $(btserviceCommonAidlInclude)
 LOCAL_C_INCLUDES += $(btserviceCommonIncludes)
 LOCAL_MODULE_TAGS := optional
@@ -155,20 +156,21 @@ include $(BUILD_EXECUTABLE)
 # Native system service unit tests for host
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
 	$(btserviceBaseTestSrc) \
 	$(btserviceCommonSrc) \
 	$(btserviceDaemonSrc) \
-	test/main.cpp \
-	test/stub_ipc_handler_binder.cpp
+	test/main.cc \
+	test/stub_ipc_handler_binder.cc
 ifeq ($(HOST_OS),linux)
 LOCAL_SRC_FILES += \
 	$(btserviceLinuxSrc) \
-	test/ipc_linux_unittest.cpp
+	test/ipc_linux_unittest.cc
 LOCAL_LDLIBS += -lrt
 else
 LOCAL_SRC_FILES += \
-	test/stub_ipc_handler_linux.cpp
+	test/stub_ipc_handler_linux.cc
 endif
 LOCAL_C_INCLUDES += $(btserviceCommonIncludes)
 LOCAL_MODULE_TAGS := debug tests
@@ -187,13 +189,14 @@ include $(BUILD_HOST_NATIVE_TEST)
 # on target.
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
 	$(btserviceBaseTestSrc) \
 	$(btserviceCommonSrc) \
 	$(btserviceBinderDaemonSrc) \
 	$(btserviceDaemonSrc) \
-	test/main.cpp \
-	test/parcelable_unittest.cpp \
+	test/main.cc \
+	test/parcelable_unittest.cc \
 	test/ParcelableTest.aidl
 LOCAL_AIDL_INCLUDES := $(btserviceCommonAidlInclude)
 LOCAL_AIDL_INCLUDES += ./
@@ -216,6 +219,7 @@ include $(BUILD_NATIVE_TEST)
 # This is a static library for target.
 # ========================================================
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
 	$(btserviceCommonSrc) \
 	$(btserviceCommonBinderSrc)
@@ -234,7 +238,8 @@ include $(BUILD_STATIC_LIBRARY)
 # Native system service CLI for target
 # ========================================================
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := client/main.cpp
+LOCAL_CPP_EXTENSION := .cc
+LOCAL_SRC_FILES := client/main.cc
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := bluetooth-cli
 LOCAL_STATIC_LIBRARIES += libbluetooth-client
@@ -254,9 +259,10 @@ include $(BUILD_EXECUTABLE)
 # TODO(armansito): Move this into a new makefile under examples/ once we build
 # a client static library that the examples can depend on.
 include $(CLEAR_VARS)
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := \
-	example/heart_rate/heart_rate_server.cpp \
-	example/heart_rate/server_main.cpp
+	example/heart_rate/heart_rate_server.cc \
+	example/heart_rate/server_main.cc
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := bt-example-hr-server
diff --git a/system/service/BUILD.gn b/system/service/BUILD.gn
index 51e58f2dc8..f82246b1f5 100644
--- a/system/service/BUILD.gn
+++ b/system/service/BUILD.gn
@@ -16,33 +16,33 @@
 
 source_set("service") {
   sources = [
-    "adapter.cpp",
-    "daemon.cpp",
-    "gatt_client.cpp",
-    "gatt_server.cpp",
-    "gatt_server_old.cpp",
-    "logging_helpers.cpp",
-    "low_energy_client.cpp",
-    "settings.cpp",
-    "common/bluetooth/advertise_data.cpp",
-    "common/bluetooth/adapter_state.cpp",
-    "common/bluetooth/uuid.cpp",
-    "common/bluetooth/scan_filter.cpp",
-    "common/bluetooth/scan_result.cpp",
-    "common/bluetooth/scan_settings.cpp",
-    "common/bluetooth/gatt_identifier.cpp",
-    "common/bluetooth/advertise_settings.cpp",
-    "common/bluetooth/util/atomic_string.cpp",
-    "common/bluetooth/util/address_helper.cpp",
-    "hal/bluetooth_interface.cpp",
-    "hal/bluetooth_gatt_interface.cpp",
-    "hal/fake_bluetooth_gatt_interface.cpp",
-    "hal/fake_bluetooth_interface.cpp",
-    "hal/gatt_helpers.cpp",
-    "ipc/ipc_handler.cpp",
-    "ipc/linux_ipc_host.cpp",
-    "ipc/ipc_manager.cpp",
-    "ipc/ipc_handler_linux.cpp",
+    "adapter.cc",
+    "daemon.cc",
+    "gatt_client.cc",
+    "gatt_server.cc",
+    "gatt_server_old.cc",
+    "logging_helpers.cc",
+    "low_energy_client.cc",
+    "settings.cc",
+    "common/bluetooth/advertise_data.cc",
+    "common/bluetooth/adapter_state.cc",
+    "common/bluetooth/uuid.cc",
+    "common/bluetooth/scan_filter.cc",
+    "common/bluetooth/scan_result.cc",
+    "common/bluetooth/scan_settings.cc",
+    "common/bluetooth/gatt_identifier.cc",
+    "common/bluetooth/advertise_settings.cc",
+    "common/bluetooth/util/atomic_string.cc",
+    "common/bluetooth/util/address_helper.cc",
+    "hal/bluetooth_interface.cc",
+    "hal/bluetooth_gatt_interface.cc",
+    "hal/fake_bluetooth_gatt_interface.cc",
+    "hal/fake_bluetooth_interface.cc",
+    "hal/gatt_helpers.cc",
+    "ipc/ipc_handler.cc",
+    "ipc/linux_ipc_host.cc",
+    "ipc/ipc_manager.cc",
+    "ipc/ipc_handler_linux.cc",
   ]
 
   include_dirs = [
@@ -59,7 +59,7 @@ source_set("service") {
 
 executable("bluetoothtbd") {
   sources = [
-    "main.cpp",
+    "main.cc",
   ]
 
   deps = [
@@ -81,10 +81,10 @@ executable("bluetoothtbd") {
 executable("service_unittests") {
   testonly = true
   sources = [
-    "test/fake_hal_util.cpp",
-    "test/ipc_linux_unittest.cpp",
-    "test/settings_unittest.cpp",
-    "test/uuid_unittest.cpp",
+    "test/fake_hal_util.cc",
+    "test/ipc_linux_unittest.cc",
+    "test/settings_unittest.cc",
+    "test/uuid_unittest.cc",
   ]
 
   include_dirs = [ "//" ]
diff --git a/system/service/adapter.cpp b/system/service/adapter.cc
index 45826b2877..45826b2877 100644
--- a/system/service/adapter.cpp
+++ b/system/service/adapter.cc
diff --git a/system/service/client/main.cpp b/system/service/client/main.cc
index 113bba2e03..113bba2e03 100644
--- a/system/service/client/main.cpp
+++ b/system/service/client/main.cc
diff --git a/system/service/common/android/bluetooth/advertise_data.cpp b/system/service/common/android/bluetooth/advertise_data.cc
index 8c4f032af3..8c4f032af3 100644
--- a/system/service/common/android/bluetooth/advertise_data.cpp
+++ b/system/service/common/android/bluetooth/advertise_data.cc
diff --git a/system/service/common/android/bluetooth/advertise_settings.cpp b/system/service/common/android/bluetooth/advertise_settings.cc
index b8fb1d1547..b8fb1d1547 100644
--- a/system/service/common/android/bluetooth/advertise_settings.cpp
+++ b/system/service/common/android/bluetooth/advertise_settings.cc
diff --git a/system/service/common/android/bluetooth/gatt_identifier.cpp b/system/service/common/android/bluetooth/gatt_identifier.cc
index fa61db9ea1..fa61db9ea1 100644
--- a/system/service/common/android/bluetooth/gatt_identifier.cpp
+++ b/system/service/common/android/bluetooth/gatt_identifier.cc
diff --git a/system/service/common/android/bluetooth/scan_filter.cpp b/system/service/common/android/bluetooth/scan_filter.cc
index 514b932815..514b932815 100644
--- a/system/service/common/android/bluetooth/scan_filter.cpp
+++ b/system/service/common/android/bluetooth/scan_filter.cc
diff --git a/system/service/common/android/bluetooth/scan_result.cpp b/system/service/common/android/bluetooth/scan_result.cc
index ddc07ef0dd..ddc07ef0dd 100644
--- a/system/service/common/android/bluetooth/scan_result.cpp
+++ b/system/service/common/android/bluetooth/scan_result.cc
diff --git a/system/service/common/android/bluetooth/scan_settings.cpp b/system/service/common/android/bluetooth/scan_settings.cc
index 0920cca27b..0920cca27b 100644
--- a/system/service/common/android/bluetooth/scan_settings.cpp
+++ b/system/service/common/android/bluetooth/scan_settings.cc
diff --git a/system/service/common/android/bluetooth/uuid.cpp b/system/service/common/android/bluetooth/uuid.cc
index 6d03bb64fe..6d03bb64fe 100644
--- a/system/service/common/android/bluetooth/uuid.cpp
+++ b/system/service/common/android/bluetooth/uuid.cc
diff --git a/system/service/common/bluetooth/adapter_state.cpp b/system/service/common/bluetooth/adapter_state.cc
index 87d23b1d26..87d23b1d26 100644
--- a/system/service/common/bluetooth/adapter_state.cpp
+++ b/system/service/common/bluetooth/adapter_state.cc
diff --git a/system/service/common/bluetooth/advertise_data.cpp b/system/service/common/bluetooth/advertise_data.cc
index c745afa1b9..c745afa1b9 100644
--- a/system/service/common/bluetooth/advertise_data.cpp
+++ b/system/service/common/bluetooth/advertise_data.cc
diff --git a/system/service/common/bluetooth/advertise_settings.cpp b/system/service/common/bluetooth/advertise_settings.cc
index ffe65ea118..ffe65ea118 100644
--- a/system/service/common/bluetooth/advertise_settings.cpp
+++ b/system/service/common/bluetooth/advertise_settings.cc
diff --git a/system/service/common/bluetooth/gatt_identifier.cpp b/system/service/common/bluetooth/gatt_identifier.cc
index 312a6c4de7..312a6c4de7 100644
--- a/system/service/common/bluetooth/gatt_identifier.cpp
+++ b/system/service/common/bluetooth/gatt_identifier.cc
diff --git a/system/service/common/bluetooth/scan_filter.cpp b/system/service/common/bluetooth/scan_filter.cc
index beeeedcf2b..beeeedcf2b 100644
--- a/system/service/common/bluetooth/scan_filter.cpp
+++ b/system/service/common/bluetooth/scan_filter.cc
diff --git a/system/service/common/bluetooth/scan_result.cpp b/system/service/common/bluetooth/scan_result.cc
index 76567786b4..76567786b4 100644
--- a/system/service/common/bluetooth/scan_result.cpp
+++ b/system/service/common/bluetooth/scan_result.cc
diff --git a/system/service/common/bluetooth/scan_settings.cpp b/system/service/common/bluetooth/scan_settings.cc
index 2c807c00bb..2c807c00bb 100644
--- a/system/service/common/bluetooth/scan_settings.cpp
+++ b/system/service/common/bluetooth/scan_settings.cc
diff --git a/system/service/common/bluetooth/util/address_helper.cpp b/system/service/common/bluetooth/util/address_helper.cc
index 51f896273c..51f896273c 100644
--- a/system/service/common/bluetooth/util/address_helper.cpp
+++ b/system/service/common/bluetooth/util/address_helper.cc
diff --git a/system/service/common/bluetooth/util/atomic_string.cpp b/system/service/common/bluetooth/util/atomic_string.cc
index 0084700919..0084700919 100644
--- a/system/service/common/bluetooth/util/atomic_string.cpp
+++ b/system/service/common/bluetooth/util/atomic_string.cc
diff --git a/system/service/common/bluetooth/uuid.cpp b/system/service/common/bluetooth/uuid.cc
index 575b055c08..575b055c08 100644
--- a/system/service/common/bluetooth/uuid.cpp
+++ b/system/service/common/bluetooth/uuid.cc
diff --git a/system/service/daemon.cpp b/system/service/daemon.cc
index 0439c36661..0439c36661 100644
--- a/system/service/daemon.cpp
+++ b/system/service/daemon.cc
diff --git a/system/service/example/heart_rate/heart_rate_server.cpp b/system/service/example/heart_rate/heart_rate_server.cc
index 9e37e90600..9e37e90600 100644
--- a/system/service/example/heart_rate/heart_rate_server.cpp
+++ b/system/service/example/heart_rate/heart_rate_server.cc
diff --git a/system/service/example/heart_rate/server_main.cpp b/system/service/example/heart_rate/server_main.cc
index c7477f5bb7..c7477f5bb7 100644
--- a/system/service/example/heart_rate/server_main.cpp
+++ b/system/service/example/heart_rate/server_main.cc
diff --git a/system/service/gatt_client.cpp b/system/service/gatt_client.cc
index a8f48c86c7..a8f48c86c7 100644
--- a/system/service/gatt_client.cpp
+++ b/system/service/gatt_client.cc
diff --git a/system/service/gatt_server.cpp b/system/service/gatt_server.cc
index e70f093bc9..e70f093bc9 100644
--- a/system/service/gatt_server.cpp
+++ b/system/service/gatt_server.cc
diff --git a/system/service/gatt_server_old.cpp b/system/service/gatt_server_old.cc
index 204a441946..204a441946 100644
--- a/system/service/gatt_server_old.cpp
+++ b/system/service/gatt_server_old.cc
diff --git a/system/service/hal/bluetooth_gatt_interface.cpp b/system/service/hal/bluetooth_gatt_interface.cc
index 2f7cf538af..2f7cf538af 100644
--- a/system/service/hal/bluetooth_gatt_interface.cpp
+++ b/system/service/hal/bluetooth_gatt_interface.cc
diff --git a/system/service/hal/bluetooth_interface.cpp b/system/service/hal/bluetooth_interface.cc
index a551feec41..a551feec41 100644
--- a/system/service/hal/bluetooth_interface.cpp
+++ b/system/service/hal/bluetooth_interface.cc
diff --git a/system/service/hal/fake_bluetooth_gatt_interface.cpp b/system/service/hal/fake_bluetooth_gatt_interface.cc
index d16cda293c..d16cda293c 100644
--- a/system/service/hal/fake_bluetooth_gatt_interface.cpp
+++ b/system/service/hal/fake_bluetooth_gatt_interface.cc
diff --git a/system/service/hal/fake_bluetooth_interface.cpp b/system/service/hal/fake_bluetooth_interface.cc
index 5036c63c54..5036c63c54 100644
--- a/system/service/hal/fake_bluetooth_interface.cpp
+++ b/system/service/hal/fake_bluetooth_interface.cc
diff --git a/system/service/hal/gatt_helpers.cpp b/system/service/hal/gatt_helpers.cc
index b12abb7213..b12abb7213 100644
--- a/system/service/hal/gatt_helpers.cpp
+++ b/system/service/hal/gatt_helpers.cc
diff --git a/system/service/ipc/binder/bluetooth_binder_server.cpp b/system/service/ipc/binder/bluetooth_binder_server.cc
index f85dc04ac7..f85dc04ac7 100644
--- a/system/service/ipc/binder/bluetooth_binder_server.cpp
+++ b/system/service/ipc/binder/bluetooth_binder_server.cc
diff --git a/system/service/ipc/binder/bluetooth_gatt_client_binder_server.cpp b/system/service/ipc/binder/bluetooth_gatt_client_binder_server.cc
index 77a5f756c4..77a5f756c4 100644
--- a/system/service/ipc/binder/bluetooth_gatt_client_binder_server.cpp
+++ b/system/service/ipc/binder/bluetooth_gatt_client_binder_server.cc
diff --git a/system/service/ipc/binder/bluetooth_gatt_server_binder_server.cpp b/system/service/ipc/binder/bluetooth_gatt_server_binder_server.cc
index 8d7c057ee3..8d7c057ee3 100644
--- a/system/service/ipc/binder/bluetooth_gatt_server_binder_server.cpp
+++ b/system/service/ipc/binder/bluetooth_gatt_server_binder_server.cc
diff --git a/system/service/ipc/binder/bluetooth_low_energy_binder_server.cpp b/system/service/ipc/binder/bluetooth_low_energy_binder_server.cc
index ea459f3e43..ea459f3e43 100644
--- a/system/service/ipc/binder/bluetooth_low_energy_binder_server.cpp
+++ b/system/service/ipc/binder/bluetooth_low_energy_binder_server.cc
diff --git a/system/service/ipc/binder/interface_with_instances_base.cpp b/system/service/ipc/binder/interface_with_instances_base.cc
index 2005bf09cd..2005bf09cd 100644
--- a/system/service/ipc/binder/interface_with_instances_base.cpp
+++ b/system/service/ipc/binder/interface_with_instances_base.cc
diff --git a/system/service/ipc/binder/ipc_handler_binder.cpp b/system/service/ipc/binder/ipc_handler_binder.cc
index c1757d0344..c1757d0344 100644
--- a/system/service/ipc/binder/ipc_handler_binder.cpp
+++ b/system/service/ipc/binder/ipc_handler_binder.cc
diff --git a/system/service/ipc/ipc_handler.cpp b/system/service/ipc/ipc_handler.cc
index ffea0ee041..ffea0ee041 100644
--- a/system/service/ipc/ipc_handler.cpp
+++ b/system/service/ipc/ipc_handler.cc
diff --git a/system/service/ipc/ipc_handler_linux.cpp b/system/service/ipc/ipc_handler_linux.cc
index b9f181e74a..b9f181e74a 100644
--- a/system/service/ipc/ipc_handler_linux.cpp
+++ b/system/service/ipc/ipc_handler_linux.cc
diff --git a/system/service/ipc/ipc_manager.cpp b/system/service/ipc/ipc_manager.cc
index b0e82c87e1..b0e82c87e1 100644
--- a/system/service/ipc/ipc_manager.cpp
+++ b/system/service/ipc/ipc_manager.cc
diff --git a/system/service/ipc/linux_ipc_host.cpp b/system/service/ipc/linux_ipc_host.cc
index f0ca34c28d..f0ca34c28d 100644
--- a/system/service/ipc/linux_ipc_host.cpp
+++ b/system/service/ipc/linux_ipc_host.cc
diff --git a/system/service/logging_helpers.cpp b/system/service/logging_helpers.cc
index 287a7631c3..287a7631c3 100644
--- a/system/service/logging_helpers.cpp
+++ b/system/service/logging_helpers.cc
diff --git a/system/service/low_energy_client.cpp b/system/service/low_energy_client.cc
index aae554c98e..aae554c98e 100644
--- a/system/service/low_energy_client.cpp
+++ b/system/service/low_energy_client.cc
diff --git a/system/service/main.cpp b/system/service/main.cc
index fc5eec66cd..fc5eec66cd 100644
--- a/system/service/main.cpp
+++ b/system/service/main.cc
diff --git a/system/service/settings.cpp b/system/service/settings.cc
index dee0e69cb3..dee0e69cb3 100644
--- a/system/service/settings.cpp
+++ b/system/service/settings.cc
diff --git a/system/service/test/adapter_unittest.cpp b/system/service/test/adapter_unittest.cc
index d72eaf6eae..d72eaf6eae 100644
--- a/system/service/test/adapter_unittest.cpp
+++ b/system/service/test/adapter_unittest.cc
diff --git a/system/service/test/advertise_data_unittest.cpp b/system/service/test/advertise_data_unittest.cc
index 8c252817ad..8c252817ad 100644
--- a/system/service/test/advertise_data_unittest.cpp
+++ b/system/service/test/advertise_data_unittest.cc
diff --git a/system/service/test/fake_hal_util.cpp b/system/service/test/fake_hal_util.cc
index d909ad26c8..d909ad26c8 100644
--- a/system/service/test/fake_hal_util.cpp
+++ b/system/service/test/fake_hal_util.cc
diff --git a/system/service/test/gatt_client_unittest.cpp b/system/service/test/gatt_client_unittest.cc
index 67b0c1de45..67b0c1de45 100644
--- a/system/service/test/gatt_client_unittest.cpp
+++ b/system/service/test/gatt_client_unittest.cc
diff --git a/system/service/test/gatt_identifier_unittest.cpp b/system/service/test/gatt_identifier_unittest.cc
index 956edf90ee..956edf90ee 100644
--- a/system/service/test/gatt_identifier_unittest.cpp
+++ b/system/service/test/gatt_identifier_unittest.cc
diff --git a/system/service/test/gatt_server_unittest.cpp b/system/service/test/gatt_server_unittest.cc
index bacff839d7..bacff839d7 100644
--- a/system/service/test/gatt_server_unittest.cpp
+++ b/system/service/test/gatt_server_unittest.cc
diff --git a/system/service/test/ipc_linux_unittest.cpp b/system/service/test/ipc_linux_unittest.cc
index dfc2693c87..dfc2693c87 100644
--- a/system/service/test/ipc_linux_unittest.cpp
+++ b/system/service/test/ipc_linux_unittest.cc
diff --git a/system/service/test/low_energy_client_unittest.cpp b/system/service/test/low_energy_client_unittest.cc
index cecdc8e47c..cecdc8e47c 100644
--- a/system/service/test/low_energy_client_unittest.cpp
+++ b/system/service/test/low_energy_client_unittest.cc
diff --git a/system/service/test/main.cpp b/system/service/test/main.cc
index 458a83bc29..458a83bc29 100644
--- a/system/service/test/main.cpp
+++ b/system/service/test/main.cc
diff --git a/system/service/test/parcelable_unittest.cpp b/system/service/test/parcelable_unittest.cc
index c691e8da50..c691e8da50 100644
--- a/system/service/test/parcelable_unittest.cpp
+++ b/system/service/test/parcelable_unittest.cc
diff --git a/system/service/test/settings_unittest.cpp b/system/service/test/settings_unittest.cc
index 52145a89d9..52145a89d9 100644
--- a/system/service/test/settings_unittest.cpp
+++ b/system/service/test/settings_unittest.cc
diff --git a/system/service/test/stub_ipc_handler_binder.cpp b/system/service/test/stub_ipc_handler_binder.cc
index 6f5a13dfe5..6f5a13dfe5 100644
--- a/system/service/test/stub_ipc_handler_binder.cpp
+++ b/system/service/test/stub_ipc_handler_binder.cc
diff --git a/system/service/test/stub_ipc_handler_linux.cpp b/system/service/test/stub_ipc_handler_linux.cc
index a36717e686..a36717e686 100644
--- a/system/service/test/stub_ipc_handler_linux.cpp
+++ b/system/service/test/stub_ipc_handler_linux.cc
diff --git a/system/service/test/util_unittest.cpp b/system/service/test/util_unittest.cc
index 78960d99f7..78960d99f7 100644
--- a/system/service/test/util_unittest.cpp
+++ b/system/service/test/util_unittest.cc
diff --git a/system/service/test/uuid_unittest.cpp b/system/service/test/uuid_unittest.cc
index 207be4ab00..207be4ab00 100644
--- a/system/service/test/uuid_unittest.cpp
+++ b/system/service/test/uuid_unittest.cc
diff --git a/system/test/suite/Android.mk b/system/test/suite/Android.mk
index aa9d98ba2b..7525d4ed9c 100644
--- a/system/test/suite/Android.mk
+++ b/system/test/suite/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 # Bluetooth test suite for target
 # ========================================================
 include $(CLEAR_VARS)
-
+LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := net_test_bluetooth
 
@@ -27,18 +27,18 @@ LOCAL_MODULE := net_test_bluetooth
 # with the interface using C++
 # TODO: Make the bluetoothtbd HAL a static library
 bluetoothHalSrc := \
-  ../../service/hal/bluetooth_gatt_interface.cpp \
-  ../../service/hal/bluetooth_interface.cpp \
-  ../../service/logging_helpers.cpp
+  ../../service/hal/bluetooth_gatt_interface.cc \
+  ../../service/hal/bluetooth_interface.cc \
+  ../../service/logging_helpers.cc
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/../../
 
 LOCAL_SRC_FILES := \
-    adapter/adapter_unittest.cpp \
-    adapter/bluetooth_test.cpp \
-    gatt/gatt_test.cpp \
-    gatt/gatt_unittest.cpp \
+    adapter/adapter_unittest.cc \
+    adapter/bluetooth_test.cc \
+    gatt/gatt_test.cc \
+    gatt/gatt_unittest.cc \
     $(bluetoothHalSrc)
 
 LOCAL_SHARED_LIBRARIES += \
diff --git a/system/test/suite/BUILD.gn b/system/test/suite/BUILD.gn
index 72188520c0..3cd3bd794c 100644
--- a/system/test/suite/BUILD.gn
+++ b/system/test/suite/BUILD.gn
@@ -17,8 +17,8 @@
 executable("net_test_bluetooth") {
   testonly = true
   sources = [
-    "adapter/adapter_unittest.cpp",
-    "adapter/bluetooth_test.cpp",
+    "adapter/adapter_unittest.cc",
+    "adapter/bluetooth_test.cc",
   ]
 
   include_dirs = [
diff --git a/system/test/suite/adapter/adapter_unittest.cpp b/system/test/suite/adapter/adapter_unittest.cc
index 1f78b210bf..1f78b210bf 100644
--- a/system/test/suite/adapter/adapter_unittest.cpp
+++ b/system/test/suite/adapter/adapter_unittest.cc
diff --git a/system/test/suite/adapter/bluetooth_test.cpp b/system/test/suite/adapter/bluetooth_test.cc
index 91229db6e3..91229db6e3 100644
--- a/system/test/suite/adapter/bluetooth_test.cpp
+++ b/system/test/suite/adapter/bluetooth_test.cc
diff --git a/system/test/suite/gatt/gatt_test.cpp b/system/test/suite/gatt/gatt_test.cc
index a7912bbddf..a7912bbddf 100644
--- a/system/test/suite/gatt/gatt_test.cpp
+++ b/system/test/suite/gatt/gatt_test.cc
diff --git a/system/test/suite/gatt/gatt_unittest.cpp b/system/test/suite/gatt/gatt_unittest.cc
index e73163441e..e73163441e 100644
--- a/system/test/suite/gatt/gatt_unittest.cpp
+++ b/system/test/suite/gatt/gatt_unittest.cc