diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-02-10 22:44:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-02-10 22:44:20 +0000 |
| commit | 7772490dacf03e2abb6728785810025bcdf139a8 (patch) | |
| tree | 24f9b75cd9551cea9b668b14be2688852cbd9ec7 | |
| parent | 3ee17a2b80391e6f516e670101a23074e9a0c084 (diff) | |
| parent | 95a76c25f788ae8bfee3dde80fddb8604c6c5e85 (diff) | |
| download | platform_external_protobuf-android-games-sdk-unity-release.tar.gz platform_external_protobuf-android-games-sdk-unity-release.tar.bz2 platform_external_protobuf-android-games-sdk-unity-release.zip | |
Merge "Snap for 6195144 from fcd1d5e3e315fb693422fd7125884d984ca24e99 to android-games-sdk-release" into android-games-sdk-releaseandroid-games-sdk-unity-releaseandroid-games-sdk-unity-dev
| -rw-r--r-- | cmake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/google/protobuf/port_def.inc | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 71a0f37aa..ebc7b0c98 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -198,6 +198,7 @@ get_filename_component(protobuf_source_dir ${protobuf_SOURCE_DIR} PATH) include_directories( ${ZLIB_INCLUDE_DIRECTORIES} ${protobuf_BINARY_DIR} + ${protobuf_source_dir}/android ${protobuf_source_dir}/src) if (MSVC) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index 57a2209e0..df08f7957 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -297,9 +297,18 @@ // ANDROID: autotdetect RTTI. Managing RTTI through command line -D // parameters is hard across modules, just autodetect it. #undef GOOGLE_PROTOBUF_NO_RTTI + +#if defined(__clang__) #if !__has_feature(cxx_rtti) #define GOOGLE_PROTOBUF_NO_RTTI 1 #endif +#elif defined(__GNUC__) +#if !defined(__GXX_RTTI) +#define GOOGLE_PROTOBUF_NO_RTTI 1 +#endif +#else +#define GOOGLE_PROTOBUF_NO_RTTI 1 +#endif #if defined(GOOGLE_PROTOBUF_NO_RTTI) && GOOGLE_PROTOBUF_NO_RTTI #define PROTOBUF_RTTI 0 |