diff options
author | Mathias Agopian <mathias@google.com> | 2013-05-06 20:20:50 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2013-05-07 18:28:11 -0700 |
commit | 002e1e58dfe19dd3e49a59c6827cbf51573941a2 (patch) | |
tree | 6dc444d7f05aa0512e3c97344d86ee0264daf869 /include/private | |
parent | b4f1a027cbadd4cd07341f60f859ae34643b68ae (diff) | |
download | frameworks_native-002e1e58dfe19dd3e49a59c6827cbf51573941a2.zip frameworks_native-002e1e58dfe19dd3e49a59c6827cbf51573941a2.tar.gz frameworks_native-002e1e58dfe19dd3e49a59c6827cbf51573941a2.tar.bz2 |
libutils clean-up
Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386
Diffstat (limited to 'include/private')
-rw-r--r-- | include/private/binder/Static.h | 3 | ||||
-rw-r--r-- | include/private/utils/Static.h | 35 |
2 files changed, 3 insertions, 35 deletions
diff --git a/include/private/binder/Static.h b/include/private/binder/Static.h index 5b0f9fc..6a03594 100644 --- a/include/private/binder/Static.h +++ b/include/private/binder/Static.h @@ -27,6 +27,9 @@ namespace android { +// For TextStream.cpp +extern Vector<int32_t> gTextBuffers; + // For ProcessState.cpp extern Mutex gProcessMutex; extern sp<ProcessState> gProcess; diff --git a/include/private/utils/Static.h b/include/private/utils/Static.h deleted file mode 100644 index d95ae0d..0000000 --- a/include/private/utils/Static.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// All static variables go here, to control initialization and -// destruction order in the library. - -#include <utils/threads.h> -#include <utils/KeyedVector.h> - -namespace android { -// For TextStream.cpp -extern Vector<int32_t> gTextBuffers; - -// For String8.cpp -extern void initialize_string8(); -extern void terminate_string8(); - -// For String16.cpp -extern void initialize_string16(); -extern void terminate_string16(); - -} // namespace android |