tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move the template out of extern "C".

Browse source 
Fixes mac build

Test: rely on post-submit
Change-Id: I3a6e7fe7d81cd0dfa46e4ded5a543c4cb8c6ca64
This commit is contained in:
Nicolas Geoffray 2019-01-14 14:12:03 +00:00
parent 9e03e1d2dc
commit e7de61676c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libnativebridge/native_bridge.cc
View file

@ -33,6 +33,11 @@
namespace android {
#ifdef __APPLE__
template <typename T>
void UNUSED(const T&) {}
#endif
extern "C" {
// Environment values required by the apps running with native bridge.
@ -254,10 +259,6 @@ bool NeedsNativeBridge(const char* instruction_set) {
return strncmp(instruction_set, ABI_STRING, strlen(ABI_STRING) + 1) != 0;
}
#ifdef __APPLE__
template<typename T> void UNUSED(const T&) {}
#endif
bool PreInitializeNativeBridge(const char* app_data_dir_in, const char* instruction_set) {
if (state != NativeBridgeState::kOpened) {
ALOGE("Invalid state: native bridge is expected to be opened.");