Merge changes I140d291e,Id443ec5c (7d8775a8) · Commits · e / os / android_frameworks_base

cmds/surfaceflinger/Android.mk

deleted100644 → 0

+0 −17

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		main_surfaceflinger.cpp

		LOCAL_SHARED_LIBRARIES := \
		libsurfaceflinger \
		libbinder \
		libutils

		LOCAL_C_INCLUDES := \
		$(LOCAL_PATH)/../../services/surfaceflinger

		LOCAL_MODULE:= surfaceflinger

		include $(BUILD_EXECUTABLE)

cmds/surfaceflinger/main_surfaceflinger.cpp

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.
		*/

		#include <binder/BinderService.h>
		#include <SurfaceFlinger.h>

		using namespace android;

		int main(int argc, char** argv) {
		SurfaceFlinger::publishAndJoinThreadPool(true);
		return 0;
		}

cmds/system_server/library/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,13 +5,14 @@ LOCAL_SRC_FILES:= \
		system_init.cpp

		base = $(LOCAL_PATH)/../../..
		native = $(LOCAL_PATH)/../../../../native

		LOCAL_C_INCLUDES := \
		$(base)/services/camera/libcameraservice \
		$(base)/services/audioflinger \
		$(base)/services/surfaceflinger \
		$(base)/services/sensorservice \
		$(base)/media/libmediaplayerservice \
		$(native)/services/surfaceflinger \
		$(JNI_H_INCLUDE)

		LOCAL_SHARED_LIBRARIES := \

core/jni/Android.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -159,12 +159,10 @@ LOCAL_C_INCLUDES += \
		$(JNI_H_INCLUDE) \
		$(LOCAL_PATH)/android/graphics \
		$(LOCAL_PATH)/../../libs/hwui \
		$(LOCAL_PATH)/../../opengl/libs \
		$(LOCAL_PATH)/../../../native/opengl/libs \
		$(call include-path-for, bluedroid) \
		$(call include-path-for, libhardware)/hardware \
		$(call include-path-for, libhardware_legacy)/hardware_legacy \
		$(LOCAL_PATH)/../../include/ui \
		$(LOCAL_PATH)/../../include/utils \
		external/skia/include/core \
		external/skia/include/effects \
		external/skia/include/images \

include/binder/Binder.h

deleted100644 → 0

+0 −103

Original line number	Diff line number	Diff line
		/*
		* 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.
		*/

		#ifndef ANDROID_BINDER_H
		#define ANDROID_BINDER_H

		#include <binder/IBinder.h>

		// ---------------------------------------------------------------------------
		namespace android {

		class BBinder : public IBinder
		{
		public:
		BBinder();

		virtual const String16& getInterfaceDescriptor() const;
		virtual bool isBinderAlive() const;
		virtual status_t pingBinder();
		virtual status_t dump(int fd, const Vector<String16>& args);

		virtual status_t transact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);

		virtual status_t linkToDeath(const sp<DeathRecipient>& recipient,
		void* cookie = NULL,
		uint32_t flags = 0);

		virtual status_t unlinkToDeath( const wp<DeathRecipient>& recipient,
		void* cookie = NULL,
		uint32_t flags = 0,
		wp<DeathRecipient>* outRecipient = NULL);

		virtual void attachObject( const void* objectID,
		void* object,
		void* cleanupCookie,
		object_cleanup_func func);
		virtual void* findObject(const void* objectID) const;
		virtual void detachObject(const void* objectID);

		virtual BBinder* localBinder();

		protected:
		virtual ~BBinder();

		virtual status_t onTransact( uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags = 0);

		private:
		BBinder(const BBinder& o);
		BBinder& operator=(const BBinder& o);

		class Extras;

		Extras* mExtras;
		void* mReserved0;
		};

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

		class BpRefBase : public virtual RefBase
		{
		protected:
		BpRefBase(const sp<IBinder>& o);
		virtual ~BpRefBase();
		virtual void onFirstRef();
		virtual void onLastStrongRef(const void* id);
		virtual bool onIncStrongAttempted(uint32_t flags, const void* id);

		inline IBinder* remote() { return mRemote; }
		inline IBinder* remote() const { return mRemote; }

		private:
		BpRefBase(const BpRefBase& o);
		BpRefBase& operator=(const BpRefBase& o);

		IBinder* const mRemote;
		RefBase::weakref_type* mRefs;
		volatile int32_t mState;
		};

		}; // namespace android

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

		#endif // ANDROID_BINDER_H