diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2015-09-23 20:39:53 -0700 |
|---|---|---|
| committer | Scott James Remnant <keybuk@google.com> | 2015-10-19 10:36:25 -0700 |
| commit | c196f214c5ae349ec2022f8d3cbaf56910b3b9f8 (patch) | |
| tree | 6046f2b389aa07e9d5cba0e564d7dd0ec2b16e87 /btcore | |
| parent | 89ba148d2e19e6633318dd2d9a04bd2728281c30 (diff) | |
| download | android_system_bt-c196f214c5ae349ec2022f8d3cbaf56910b3b9f8.tar.gz android_system_bt-c196f214c5ae349ec2022f8d3cbaf56910b3b9f8.tar.bz2 android_system_bt-c196f214c5ae349ec2022f8d3cbaf56910b3b9f8.zip | |
GKI cleanup - Moved GKI_get_os_tick_count() to OSI
* Renamed function GKI_get_os_tick_count() to time_get_os_boottime_ms()
and moved it to the OSI module: to the new file osi/src/time.c .
The corresponding header file is osi/include/time.h
* Added unit tests for function time_get_os_boottime_ms() in file
osi/test/time_test.cpp
* Removed "osi/include" from the list of paths to search for include
files. This is needed, because file name collision of "time.h"
in osi/include and the system <time.h>
Change-Id: I934be0c8f392150a352947326546bcf8aa070f97
Diffstat (limited to 'btcore')
| -rw-r--r-- | btcore/Android.mk | 1 | ||||
| -rw-r--r-- | btcore/BUILD.gn | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/btcore/Android.mk b/btcore/Android.mk index 8c9e1f1fd..508c5f86a 100644 --- a/btcore/Android.mk +++ b/btcore/Android.mk @@ -40,7 +40,6 @@ btcoreCommonTestSrc := \ btcoreCommonIncludes := \ $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../osi/include \ $(LOCAL_PATH)/.. # libbtcore static library for target diff --git a/btcore/BUILD.gn b/btcore/BUILD.gn index 624733bca..356115e95 100644 --- a/btcore/BUILD.gn +++ b/btcore/BUILD.gn @@ -27,7 +27,6 @@ static_library("btcore") { include_dirs = [ "include", - "//osi/include", "//", ] } |