Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8db1c561 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 61511461 359b3fd8

NOTICE

+10 −0
Original line number Diff line number Diff line
@@ -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

include/binder/Binder.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ private: 


            Extras*     mExtras;

            void*       mReserved0;

    static  String16    sEmptyDescriptor;

};



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

libs/binder/Android.mk

+25 −24
Original line number Diff line number Diff line
@@ -12,11 +12,8 @@ 
# 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:= \

sources := \

    Binder.cpp \

    BpBinder.cpp \

    IInterface.cpp \
@@ -33,13 +30,17 @@ LOCAL_SRC_FILES:= \ 
    ProcessState.cpp \

    Static.cpp



LOCAL_LDLIBS += -lpthread



LOCAL_SHARED_LIBRARIES := \

	liblog \

	libcutils \

	libutils

LOCAL_PATH:= $(call my-dir)



include $(CLEAR_VARS)

LOCAL_LDLIBS += -lpthread

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)

libs/binder/Binder.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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;

}

libs/utils/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -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