Skip to content

Commit b5fca80

Browse files
dulmandakhfacebook-github-bot
authored andcommitted
bump glog to 0.3.5 (#19890)
Summary: bump glog to 0.3.5. Version 0.3.4 added support for libc++ or clang. Starting with revision 11, Android NDK recommends and defaults to clang, so it'll add support for it. notable changes in 0.3.4 and 0.3.5: * add libc++ support * reduce dynamic allocation from 3 to 1 per log message * style fix for C++11 * Add CMake support Closes #19890 Differential Revision: D8662179 Pulled By: hramos fbshipit-source-id: ae2554d36e5b922e8649fc2ac7afc273a34cc127
1 parent 0d78415 commit b5fca80

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

ReactAndroid/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
2424
// - boost_1_63_0
2525
// - double-conversion-1.1.6
2626
// - folly-deprecate-dynamic-initializer
27-
// - glog-0.3.3
27+
// - glog-0.3.5
2828
// - jsc-headers
2929
def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
3030

@@ -89,18 +89,18 @@ task prepareFolly(dependsOn: dependenciesPath ? [] : [downloadFolly], type: Copy
8989
}
9090

9191
task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
92-
src 'https://github.com/google/glog/archive/v0.3.3.tar.gz'
92+
src 'https://github.com/google/glog/archive/v0.3.5.tar.gz'
9393
onlyIfNewer true
9494
overwrite false
95-
dest new File(downloadsDir, 'glog-0.3.3.tar.gz')
95+
dest new File(downloadsDir, 'glog-0.3.5.tar.gz')
9696
}
9797

9898
// Prepare glog sources to be compiled, this task will perform steps that normally should've been
9999
// executed by automake. This way we can avoid dependencies on make/automake
100100
task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) {
101101
from dependenciesPath ?: tarTree(downloadGlog.dest)
102102
from 'src/main/jni/third-party/glog/'
103-
include 'glog-0.3.3/src/**/*', 'Android.mk', 'config.h'
103+
include 'glog-0.3.5/src/**/*', 'Android.mk', 'config.h'
104104
includeEmptyDirs = false
105105
filesMatching('**/*.h.in') {
106106
filter(ReplaceTokens, tokens: [

ReactAndroid/src/main/jni/third-party/glog/Android.mk

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ LOCAL_PATH:= $(call my-dir)
33
include $(CLEAR_VARS)
44

55
LOCAL_SRC_FILES := \
6-
glog-0.3.3/src/demangle.cc \
7-
glog-0.3.3/src/logging.cc \
8-
glog-0.3.3/src/raw_logging.cc \
9-
glog-0.3.3/src/signalhandler.cc \
10-
glog-0.3.3/src/symbolize.cc \
11-
glog-0.3.3/src/utilities.cc \
12-
glog-0.3.3/src/vlog_is_on.cc
6+
glog-0.3.5/src/demangle.cc \
7+
glog-0.3.5/src/logging.cc \
8+
glog-0.3.5/src/raw_logging.cc \
9+
glog-0.3.5/src/signalhandler.cc \
10+
glog-0.3.5/src/symbolize.cc \
11+
glog-0.3.5/src/utilities.cc \
12+
glog-0.3.5/src/vlog_is_on.cc
1313

14-
LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.3/src/
14+
LOCAL_C_INCLUDES += $(LOCAL_PATH) $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
1515

16-
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.3/src/
16+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/glog-0.3.5/src/
1717

1818
LOCAL_CFLAGS += \
1919
-Wall \

ReactAndroid/src/main/jni/third-party/glog/config.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
/* define if the compiler implements namespaces */
5050
#define HAVE_NAMESPACES 1
5151

52+
/* NDK android-16 provides ssize_t pread(int, void*, size_t, off_t) */
53+
#define HAVE_PREAD 1
54+
5255
/* Define if you have POSIX threads libraries and header files. */
5356
#define HAVE_PTHREAD 1
5457

@@ -132,7 +135,7 @@
132135
#define PACKAGE_NAME "glog"
133136

134137
/* Define to the full name and version of this package. */
135-
#define PACKAGE_STRING "glog 0.3.3"
138+
#define PACKAGE_STRING "glog 0.3.5"
136139

137140
/* Define to the one symbol short name of this package. */
138141
#define PACKAGE_TARNAME "glog"
@@ -141,7 +144,7 @@
141144
#define PACKAGE_URL ""
142145

143146
/* Define to the version of this package. */
144-
#define PACKAGE_VERSION "0.3.3"
147+
#define PACKAGE_VERSION "0.3.5"
145148

146149
/* How to access the PC from a struct ucontext */
147150
/* #undef PC_FROM_UCONTEXT */
@@ -163,7 +166,7 @@
163166
#define TEST_SRC_DIR "."
164167

165168
/* Version number of package */
166-
#define VERSION "0.3.3"
169+
#define VERSION "0.3.5"
167170

168171
/* Stops putting the code inside the Google namespace */
169172
#define _END_GOOGLE_NAMESPACE_ }

0 commit comments

Comments
 (0)