diff options
| author | 2010-05-06 00:55:09 -0700 | |
|---|---|---|
| committer | 2010-05-06 01:03:31 -0700 | |
| commit | 08b3d2e5ef01a5114424a871934dd9fc153352c0 (patch) | |
| tree | 7768ecd2c0308f149cb8abb1746a0e7bc1bdae8b /libs/binder/Binder.cpp | |
| parent | df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c (diff) | |
Make static versions of libutils and libbinder.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so. The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.
Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
Diffstat (limited to 'libs/binder/Binder.cpp')
| -rw-r--r-- | libs/binder/Binder.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index 0dd762212f08..9945f9188f52 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -69,8 +69,6 @@ public: // --------------------------------------------------------------------------- -String16 BBinder::sEmptyDescriptor; - BBinder::BBinder() : mExtras(NULL) { @@ -88,6 +86,9 @@ status_t BBinder::pingBinder() const String16& BBinder::getInterfaceDescriptor() const { + // This is a local static rather than a global static, + // to avoid static initializer ordering issues. + static String16 sEmptyDescriptor; LOGW("reached BBinder::getInterfaceDescriptor (this=%p)", this); return sEmptyDescriptor; } |