ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge branch 'froyo' into froyo-release

Browse Source
This commit is contained in:
The Android Automerger 2010-05-06 17:55:07 -07:00
commit 8db1c5610f
6 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NOTICE
View File

@ -41,6 +41,16 @@ The Apache Software Foundation (http://www.apache.org/).
=========================================================================
These files are Copyright 2007 Nuance Communications, but released under
the Apache2 License.
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Media Codecs code. ==
=========================================================================
Media Codecs
These files are Copyright 1998 - 2009 PacketVideo, but released under
the Apache2 License.
Apache License

1
include/binder/Binder.h
View File

@ -71,7 +71,6 @@ private:
Extras* mExtras;
void* mReserved0;
static String16 sEmptyDescriptor;
};
// ---------------------------------------------------------------------------

49
libs/binder/Android.mk
View File

@ -12,34 +12,35 @@
# See the License for the specific language governing permissions and
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
# we have the common sources, plus some device-specific stuff
LOCAL_SRC_FILES:= \
Binder.cpp \
BpBinder.cpp \
IInterface.cpp \
IMemory.cpp \
IPCThreadState.cpp \
IPermissionController.cpp \
IServiceManager.cpp \
MemoryDealer.cpp \
sources := \
Binder.cpp \
BpBinder.cpp \
IInterface.cpp \
IMemory.cpp \
IPCThreadState.cpp \
IPermissionController.cpp \
IServiceManager.cpp \
MemoryDealer.cpp \
MemoryBase.cpp \
MemoryHeapBase.cpp \
MemoryHeapPmem.cpp \
Parcel.cpp \
Permission.cpp \
ProcessState.cpp \
Static.cpp
Parcel.cpp \
Permission.cpp \
ProcessState.cpp \
Static.cpp
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_LDLIBS += -lpthread
LOCAL_SHARED_LIBRARIES := \
liblog \
libcutils \
libutils
LOCAL_MODULE:= libbinder
LOCAL_MODULE := libbinder
LOCAL_SHARED_LIBRARIES := liblog libcutils libutils
LOCAL_SRC_FILES := $(sources)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_LDLIBS += -lpthread
LOCAL_MODULE := libbinder
LOCAL_SRC_FILES := $(sources)
include $(BUILD_STATIC_LIBRARY)

5
libs/binder/Binder.cpp
View File

@ -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;
}

10
libs/utils/Android.mk
View File

@ -104,3 +104,13 @@ endif # sim
LOCAL_MODULE:= libutils
include $(BUILD_SHARED_LIBRARY)
ifneq ($(TARGET_SIMULATOR),true)
ifeq ($(TARGET_OS),linux)
include $(CLEAR_VARS)
LOCAL_C_INCLUDES += external/zlib external/icu4c/common
LOCAL_LDLIBS := -lrt -ldl -lpthread
LOCAL_MODULE := libutils
LOCAL_SRC_FILES := $(commonSources) BackupData.cpp BackupHelpers.cpp
include $(BUILD_STATIC_LIBRARY)
endif
endif

9
libs/utils/String8.cpp
View File

@ -136,10 +136,11 @@ static inline char* getEmptyString()
void initialize_string8()
{
#ifdef LIBUTILS_NATIVE
// Bite me, Darwin!
gDarwinIsReallyAnnoying = gDarwinCantLoadAllObjects;
#endif
// HACK: This dummy dependency forces linking libutils Static.cpp,
// which is needed to initialize String8/String16 classes.
// These variables are named for Darwin, but are needed elsewhere too,
// including static linking on any platform.
gDarwinIsReallyAnnoying = gDarwinCantLoadAllObjects;
SharedBuffer* buf = SharedBuffer::alloc(1);
char* str = (char*)buf->data();