platform_system_core/base
Steven Moreland e131f31db5 libbase: fix build breakage
Two changes were merged at the same time that conflicted.

Test: builds
(cherry picked from commit 72b9d28423)
Merged-In: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
Change-Id: Ia6c730804cd5a3b2655e6d69b8e4f346d198dabb
2017-04-19 10:39:54 -07:00
..
include/android-base Add android::base::ScopeGuard 2017-04-05 16:15:33 -07:00
.clang-format Remove extraneous .clang-format files 2017-03-14 14:06:31 -07:00
Android.bp libbase: fix build breakage 2017-04-19 10:39:54 -07:00
chrono_utils.cpp bootstat: Refactor init/utils/boot_clock into base/chrono_utils. 2017-03-30 14:24:12 -07:00
chrono_utils_test.cpp bootstat: Refactor init/utils/boot_clock into base/chrono_utils. 2017-03-30 14:24:12 -07:00
CPPLINT.cfg Don't show lint errors for rvalue references. 2015-04-02 18:38:01 -07:00
endian_test.cpp Add cross-platform <android-base/endian.h>. 2017-02-24 14:03:36 -08:00
errors_test.cpp base: add SystemErrorCodeToString() function. 2016-02-01 12:18:26 -08:00
errors_unix.cpp base: add SystemErrorCodeToString() function. 2016-02-01 12:18:26 -08:00
errors_windows.cpp base: add SystemErrorCodeToString() function. 2016-02-01 12:18:26 -08:00
file.cpp Convert opens to use unique_fd. 2017-04-05 12:30:12 -07:00
file_test.cpp Keep the ReadFileToString/ReadFdToString overhead down. 2017-03-21 13:43:08 -07:00
logging.cpp base: support logging before enter main function. 2017-01-25 15:50:47 -08:00
logging_test.cpp base: support logging before enter main function. 2017-01-25 15:50:47 -08:00
parsedouble_test.cpp libbase: add parsedouble.h. 2016-10-19 11:19:42 -07:00
parseint_test.cpp Move off std::sto* function which abort on failure. 2016-10-13 15:34:05 -07:00
parsenetaddress.cpp base: add network address parsing function from adb. 2016-01-21 20:03:33 -08:00
parsenetaddress_test.cpp base: add network address parsing function from adb. 2016-01-21 20:03:33 -08:00
properties.cpp Fix timeouts for android::base::WaitForProperty* 2017-03-27 18:05:58 -07:00
properties_test.cpp Fix timeouts for android::base::WaitForProperty* 2017-03-27 18:05:58 -07:00
quick_exit.cpp Remove mutex.h and its uses. 2016-09-16 15:58:00 -07:00
quick_exit_test.cpp base: add quick_exit emulation. 2016-09-13 17:54:50 -07:00
scopeguard_test.cpp Add android::base::ScopeGuard 2017-04-05 16:15:33 -07:00
stringprintf.cpp Track rename of base/ to android-base/. 2015-12-04 22:00:26 -08:00
stringprintf_test.cpp Track rename of base/ to android-base/. 2015-12-04 22:00:26 -08:00
strings.cpp Fix ubsan failure in android::base::Split. 2017-02-13 14:13:24 -08:00
strings_test.cpp Fix ubsan failure in android::base::Split. 2017-02-13 14:13:24 -08:00
test_main.cpp Track rename of base/ to android-base/. 2015-12-04 22:00:26 -08:00
test_utils.cpp libbase: fix the way to find temp dir. 2017-02-13 15:50:56 -08:00
utf8.cpp Track rename of base/ to android-base/. 2015-12-04 22:00:26 -08:00
utf8_test.cpp Fix a couple sign-comparison warnings. 2016-01-15 12:18:14 -08:00