Merge "move native services under services/"

2010-07-26 10:01:19 -07:00
parent c7ab09ede5 6d6b749b24
commit b237bdb647
71 changed files with 6 additions and 6 deletions
--- a/cmds/surfaceflinger/Android.mk
+++ b/cmds/surfaceflinger/Android.mk
@@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libutils
 LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/../../libs/surfaceflinger
+	$(LOCAL_PATH)/../../services/surfaceflinger
 LOCAL_MODULE:= surfaceflinger
--- a/cmds/system_server/library/Android.mk
+++ b/cmds/system_server/library/Android.mk
@@ -7,9 +7,9 @@ LOCAL_SRC_FILES:= \
 base = $(LOCAL_PATH)/../../..
 LOCAL_C_INCLUDES := \
-	$(base)/camera/libcameraservice \
+	$(base)/services/camera/libcameraservice \
-	$(base)/libs/audioflinger \
+	$(base)/services/audioflinger \
-	$(base)/libs/surfaceflinger \
+	$(base)/services/surfaceflinger \
 	$(base)/media/libmediaplayerservice \
 	$(JNI_H_INCLUDE)
--- a/media/mediaserver/Android.mk
+++ b/media/mediaserver/Android.mk
@@ -14,8 +14,8 @@ LOCAL_SHARED_LIBRARIES := \
 base := $(LOCAL_PATH)/../..
 LOCAL_C_INCLUDES := \
-    $(base)/libs/audioflinger \
+    $(base)/services/audioflinger \
-    $(base)/camera/libcameraservice \
+    $(base)/services/camera/libcameraservice \
    $(base)/media/libmediaplayerservice
 LOCAL_MODULE:= mediaserver
--- a/services/audioflinger/A2dpAudioInterface.cpp
+++ b/services/audioflinger/A2dpAudioInterface.cpp
--- a/services/audioflinger/A2dpAudioInterface.h
+++ b/services/audioflinger/A2dpAudioInterface.h
--- a/services/audioflinger/Android.mk
+++ b/services/audioflinger/Android.mk
--- a/services/audioflinger/AudioBufferProvider.h
+++ b/services/audioflinger/AudioBufferProvider.h
--- a/services/audioflinger/AudioDumpInterface.cpp
+++ b/services/audioflinger/AudioDumpInterface.cpp
--- a/services/audioflinger/AudioDumpInterface.h
+++ b/services/audioflinger/AudioDumpInterface.h
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
--- a/services/audioflinger/AudioHardwareGeneric.cpp
+++ b/services/audioflinger/AudioHardwareGeneric.cpp
--- a/services/audioflinger/AudioHardwareGeneric.h
+++ b/services/audioflinger/AudioHardwareGeneric.h
--- a/services/audioflinger/AudioHardwareInterface.cpp
+++ b/services/audioflinger/AudioHardwareInterface.cpp
--- a/services/audioflinger/AudioHardwareStub.cpp
+++ b/services/audioflinger/AudioHardwareStub.cpp
--- a/services/audioflinger/AudioHardwareStub.h
+++ b/services/audioflinger/AudioHardwareStub.h
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
--- a/services/audioflinger/AudioMixer.h
+++ b/services/audioflinger/AudioMixer.h
--- a/services/audioflinger/AudioPolicyManagerBase.cpp
+++ b/services/audioflinger/AudioPolicyManagerBase.cpp
--- a/services/audioflinger/AudioPolicyService.cpp
+++ b/services/audioflinger/AudioPolicyService.cpp
--- a/services/audioflinger/AudioPolicyService.h
+++ b/services/audioflinger/AudioPolicyService.h
--- a/services/audioflinger/AudioResampler.cpp
+++ b/services/audioflinger/AudioResampler.cpp
--- a/services/audioflinger/AudioResampler.h
+++ b/services/audioflinger/AudioResampler.h
--- a/services/audioflinger/AudioResamplerCubic.cpp
+++ b/services/audioflinger/AudioResamplerCubic.cpp
--- a/services/audioflinger/AudioResamplerCubic.h
+++ b/services/audioflinger/AudioResamplerCubic.h
--- a/services/audioflinger/AudioResamplerSinc.cpp
+++ b/services/audioflinger/AudioResamplerSinc.cpp
--- a/services/audioflinger/AudioResamplerSinc.h
+++ b/services/audioflinger/AudioResamplerSinc.h
--- a/services/camera/libcameraservice/Android.mk
+++ b/services/camera/libcameraservice/Android.mk
--- a/services/camera/libcameraservice/CameraHardwareStub.cpp
+++ b/services/camera/libcameraservice/CameraHardwareStub.cpp
--- a/services/camera/libcameraservice/CameraHardwareStub.h
+++ b/services/camera/libcameraservice/CameraHardwareStub.h
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
--- a/services/camera/libcameraservice/CannedJpeg.h
+++ b/services/camera/libcameraservice/CannedJpeg.h
--- a/services/camera/libcameraservice/FakeCamera.cpp
+++ b/services/camera/libcameraservice/FakeCamera.cpp
--- a/services/camera/libcameraservice/FakeCamera.h
+++ b/services/camera/libcameraservice/FakeCamera.h
--- a/services/camera/tests/CameraServiceTest/Android.mk
+++ b/services/camera/tests/CameraServiceTest/Android.mk
--- a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp
+++ b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp
--- a/services/surfaceflinger/Android.mk
+++ b/services/surfaceflinger/Android.mk
--- a/services/surfaceflinger/Barrier.h
+++ b/services/surfaceflinger/Barrier.h
--- a/services/surfaceflinger/BlurFilter.cpp
+++ b/services/surfaceflinger/BlurFilter.cpp
--- a/services/surfaceflinger/BlurFilter.h
+++ b/services/surfaceflinger/BlurFilter.h
--- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp
--- a/services/surfaceflinger/DisplayHardware/DisplayHardware.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.h
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp
--- a/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
--- a/services/surfaceflinger/Layer.h
+++ b/services/surfaceflinger/Layer.h
--- a/services/surfaceflinger/LayerBase.cpp
+++ b/services/surfaceflinger/LayerBase.cpp
--- a/services/surfaceflinger/LayerBase.h
+++ b/services/surfaceflinger/LayerBase.h
--- a/services/surfaceflinger/LayerBlur.cpp
+++ b/services/surfaceflinger/LayerBlur.cpp
--- a/services/surfaceflinger/LayerBlur.h
+++ b/services/surfaceflinger/LayerBlur.h
--- a/services/surfaceflinger/LayerBuffer.cpp
+++ b/services/surfaceflinger/LayerBuffer.cpp
--- a/services/surfaceflinger/LayerBuffer.h
+++ b/services/surfaceflinger/LayerBuffer.h
--- a/services/surfaceflinger/LayerDim.cpp
+++ b/services/surfaceflinger/LayerDim.cpp
--- a/services/surfaceflinger/LayerDim.h
+++ b/services/surfaceflinger/LayerDim.h
--- a/services/surfaceflinger/MODULE_LICENSE_APACHE2
+++ b/services/surfaceflinger/MODULE_LICENSE_APACHE2
--- a/services/surfaceflinger/MessageQueue.cpp
+++ b/services/surfaceflinger/MessageQueue.cpp
--- a/services/surfaceflinger/MessageQueue.h
+++ b/services/surfaceflinger/MessageQueue.h
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
--- a/services/surfaceflinger/Tokenizer.cpp
+++ b/services/surfaceflinger/Tokenizer.cpp
--- a/services/surfaceflinger/Tokenizer.h
+++ b/services/surfaceflinger/Tokenizer.h
--- a/services/surfaceflinger/Transform.cpp
+++ b/services/surfaceflinger/Transform.cpp
--- a/services/surfaceflinger/Transform.h
+++ b/services/surfaceflinger/Transform.h
--- a/services/surfaceflinger/clz.cpp
+++ b/services/surfaceflinger/clz.cpp
--- a/services/surfaceflinger/clz.h
+++ b/services/surfaceflinger/clz.h
--- a/services/surfaceflinger/tests/Android.mk
+++ b/services/surfaceflinger/tests/Android.mk
--- a/services/surfaceflinger/tests/overlays/Android.mk
+++ b/services/surfaceflinger/tests/overlays/Android.mk
--- a/services/surfaceflinger/tests/overlays/overlays.cpp
+++ b/services/surfaceflinger/tests/overlays/overlays.cpp
--- a/services/surfaceflinger/tests/resize/Android.mk
+++ b/services/surfaceflinger/tests/resize/Android.mk
--- a/services/surfaceflinger/tests/resize/resize.cpp
+++ b/services/surfaceflinger/tests/resize/resize.cpp