Merge "Fix multiton issue"

namespace android {

// ---------------------------------------------------------------------------

// Singleton<TYPE> may be used in multiple libraries, only one of which should

// define the static member variables using ANDROID_SINGLETON_STATIC_INSTANCE.

// Turn off -Wundefined-var-template so other users don't get:

// instantiation of variable 'android::Singleton<TYPE>::sLock' required here,

// but no definition is available

#if defined(__clang__)

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wundefined-var-template"

#endif

template <typename TYPE>

class ANDROID_API Singleton

{

    static TYPE* sInstance;

};

template <typename TYPE>

Mutex Singleton<TYPE>::sLock;

template <typename TYPE>

TYPE* Singleton<TYPE>::sInstance;

#if defined(__clang__)

#pragma clang diagnostic pop

#endif

/*

 * use ANDROID_SINGLETON_STATIC_INSTANCE(TYPE) in your implementation file