Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7de6167 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Move the template out of extern "C". 

Fixes mac build

Test: rely on post-submit
Change-Id: I3a6e7fe7d81cd0dfa46e4ded5a543c4cb8c6ca64
parent 9e03e1d2

libnativebridge/native_bridge.cc

+5 −4
Original line number Diff line number Diff line
@@ -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.");