Merge "liblog: remove LIBLOG_WEAK"

liblog/log_portability.h

@@ -19,16 +19,6 @@
 #include <sys/cdefs.h>
 #include <unistd.h>
 
-/*
- * Declare this library function as reimplementation.
- * Prevent circular dependencies, but allow _real_ library to hijack
- */
-#if defined(_WIN32)
-#define LIBLOG_WEAK static /* Accept that it is totally private */
-#else
-#define LIBLOG_WEAK extern "C" __attribute__((weak, visibility("default")))
-#endif
-
 /* possible missing definitions in sys/cdefs.h */
 
 /* DECLS */

liblog/logprint.cpp

@@ -1145,7 +1145,7 @@ int android_log_processBinaryLogBuffer(
  * _also_ be part of libutils/Unicode.cpp if its usefullness needs to
  * propagate globally.
  */
-LIBLOG_WEAK ssize_t utf8_character_length(const char* src, size_t len) {
+static ssize_t utf8_character_length(const char* src, size_t len) {
   const char* cur = src;
   const char first_char = *cur++;
   static const uint32_t kUnicodeMaxCodepoint = 0x0010FFFF;