Merge "Move the template out of extern "C"." am: dea312bf14 (dfea54e1) · Commits · e / os / android_system_core

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.");