diff --git a/cmds/surfaceflinger/Android.mk b/cmds/surfaceflinger/Android.mk index bfa58a1cbf7f8..1df32bbc272dc 100644 --- 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 diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index 1813d3e5ab0c1..a880a913029d0 100644 --- 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)/libs/audioflinger \ - $(base)/libs/surfaceflinger \ + $(base)/services/camera/libcameraservice \ + $(base)/services/audioflinger \ + $(base)/services/surfaceflinger \ $(base)/media/libmediaplayerservice \ $(JNI_H_INCLUDE) diff --git a/media/mediaserver/Android.mk b/media/mediaserver/Android.mk index a92cea8969027..05598129646d5 100644 --- 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)/camera/libcameraservice \ + $(base)/services/audioflinger \ + $(base)/services/camera/libcameraservice \ $(base)/media/libmediaplayerservice LOCAL_MODULE:= mediaserver diff --git a/libs/audioflinger/A2dpAudioInterface.cpp b/services/audioflinger/A2dpAudioInterface.cpp similarity index 100% rename from libs/audioflinger/A2dpAudioInterface.cpp rename to services/audioflinger/A2dpAudioInterface.cpp diff --git a/libs/audioflinger/A2dpAudioInterface.h b/services/audioflinger/A2dpAudioInterface.h similarity index 100% rename from libs/audioflinger/A2dpAudioInterface.h rename to services/audioflinger/A2dpAudioInterface.h diff --git a/libs/audioflinger/Android.mk b/services/audioflinger/Android.mk similarity index 100% rename from libs/audioflinger/Android.mk rename to services/audioflinger/Android.mk diff --git a/libs/audioflinger/AudioBufferProvider.h b/services/audioflinger/AudioBufferProvider.h similarity index 100% rename from libs/audioflinger/AudioBufferProvider.h rename to services/audioflinger/AudioBufferProvider.h diff --git a/libs/audioflinger/AudioDumpInterface.cpp b/services/audioflinger/AudioDumpInterface.cpp similarity index 100% rename from libs/audioflinger/AudioDumpInterface.cpp rename to services/audioflinger/AudioDumpInterface.cpp diff --git a/libs/audioflinger/AudioDumpInterface.h b/services/audioflinger/AudioDumpInterface.h similarity index 100% rename from libs/audioflinger/AudioDumpInterface.h rename to services/audioflinger/AudioDumpInterface.h diff --git a/libs/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp similarity index 100% rename from libs/audioflinger/AudioFlinger.cpp rename to services/audioflinger/AudioFlinger.cpp diff --git a/libs/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h similarity index 100% rename from libs/audioflinger/AudioFlinger.h rename to services/audioflinger/AudioFlinger.h diff --git a/libs/audioflinger/AudioHardwareGeneric.cpp b/services/audioflinger/AudioHardwareGeneric.cpp similarity index 100% rename from libs/audioflinger/AudioHardwareGeneric.cpp rename to services/audioflinger/AudioHardwareGeneric.cpp diff --git a/libs/audioflinger/AudioHardwareGeneric.h b/services/audioflinger/AudioHardwareGeneric.h similarity index 100% rename from libs/audioflinger/AudioHardwareGeneric.h rename to services/audioflinger/AudioHardwareGeneric.h diff --git a/libs/audioflinger/AudioHardwareInterface.cpp b/services/audioflinger/AudioHardwareInterface.cpp similarity index 100% rename from libs/audioflinger/AudioHardwareInterface.cpp rename to services/audioflinger/AudioHardwareInterface.cpp diff --git a/libs/audioflinger/AudioHardwareStub.cpp b/services/audioflinger/AudioHardwareStub.cpp similarity index 100% rename from libs/audioflinger/AudioHardwareStub.cpp rename to services/audioflinger/AudioHardwareStub.cpp diff --git a/libs/audioflinger/AudioHardwareStub.h b/services/audioflinger/AudioHardwareStub.h similarity index 100% rename from libs/audioflinger/AudioHardwareStub.h rename to services/audioflinger/AudioHardwareStub.h diff --git a/libs/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp similarity index 100% rename from libs/audioflinger/AudioMixer.cpp rename to services/audioflinger/AudioMixer.cpp diff --git a/libs/audioflinger/AudioMixer.h b/services/audioflinger/AudioMixer.h similarity index 100% rename from libs/audioflinger/AudioMixer.h rename to services/audioflinger/AudioMixer.h diff --git a/libs/audioflinger/AudioPolicyManagerBase.cpp b/services/audioflinger/AudioPolicyManagerBase.cpp similarity index 100% rename from libs/audioflinger/AudioPolicyManagerBase.cpp rename to services/audioflinger/AudioPolicyManagerBase.cpp diff --git a/libs/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp similarity index 100% rename from libs/audioflinger/AudioPolicyService.cpp rename to services/audioflinger/AudioPolicyService.cpp diff --git a/libs/audioflinger/AudioPolicyService.h b/services/audioflinger/AudioPolicyService.h similarity index 100% rename from libs/audioflinger/AudioPolicyService.h rename to services/audioflinger/AudioPolicyService.h diff --git a/libs/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp similarity index 100% rename from libs/audioflinger/AudioResampler.cpp rename to services/audioflinger/AudioResampler.cpp diff --git a/libs/audioflinger/AudioResampler.h b/services/audioflinger/AudioResampler.h similarity index 100% rename from libs/audioflinger/AudioResampler.h rename to services/audioflinger/AudioResampler.h diff --git a/libs/audioflinger/AudioResamplerCubic.cpp b/services/audioflinger/AudioResamplerCubic.cpp similarity index 100% rename from libs/audioflinger/AudioResamplerCubic.cpp rename to services/audioflinger/AudioResamplerCubic.cpp diff --git a/libs/audioflinger/AudioResamplerCubic.h b/services/audioflinger/AudioResamplerCubic.h similarity index 100% rename from libs/audioflinger/AudioResamplerCubic.h rename to services/audioflinger/AudioResamplerCubic.h diff --git a/libs/audioflinger/AudioResamplerSinc.cpp b/services/audioflinger/AudioResamplerSinc.cpp similarity index 100% rename from libs/audioflinger/AudioResamplerSinc.cpp rename to services/audioflinger/AudioResamplerSinc.cpp diff --git a/libs/audioflinger/AudioResamplerSinc.h b/services/audioflinger/AudioResamplerSinc.h similarity index 100% rename from libs/audioflinger/AudioResamplerSinc.h rename to services/audioflinger/AudioResamplerSinc.h diff --git a/camera/libcameraservice/Android.mk b/services/camera/libcameraservice/Android.mk similarity index 100% rename from camera/libcameraservice/Android.mk rename to services/camera/libcameraservice/Android.mk diff --git a/camera/libcameraservice/CameraHardwareStub.cpp b/services/camera/libcameraservice/CameraHardwareStub.cpp similarity index 100% rename from camera/libcameraservice/CameraHardwareStub.cpp rename to services/camera/libcameraservice/CameraHardwareStub.cpp diff --git a/camera/libcameraservice/CameraHardwareStub.h b/services/camera/libcameraservice/CameraHardwareStub.h similarity index 100% rename from camera/libcameraservice/CameraHardwareStub.h rename to services/camera/libcameraservice/CameraHardwareStub.h diff --git a/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp similarity index 100% rename from camera/libcameraservice/CameraService.cpp rename to services/camera/libcameraservice/CameraService.cpp diff --git a/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h similarity index 100% rename from camera/libcameraservice/CameraService.h rename to services/camera/libcameraservice/CameraService.h diff --git a/camera/libcameraservice/CannedJpeg.h b/services/camera/libcameraservice/CannedJpeg.h similarity index 100% rename from camera/libcameraservice/CannedJpeg.h rename to services/camera/libcameraservice/CannedJpeg.h diff --git a/camera/libcameraservice/FakeCamera.cpp b/services/camera/libcameraservice/FakeCamera.cpp similarity index 100% rename from camera/libcameraservice/FakeCamera.cpp rename to services/camera/libcameraservice/FakeCamera.cpp diff --git a/camera/libcameraservice/FakeCamera.h b/services/camera/libcameraservice/FakeCamera.h similarity index 100% rename from camera/libcameraservice/FakeCamera.h rename to services/camera/libcameraservice/FakeCamera.h diff --git a/camera/tests/CameraServiceTest/Android.mk b/services/camera/tests/CameraServiceTest/Android.mk similarity index 100% rename from camera/tests/CameraServiceTest/Android.mk rename to services/camera/tests/CameraServiceTest/Android.mk diff --git a/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp similarity index 100% rename from camera/tests/CameraServiceTest/CameraServiceTest.cpp rename to services/camera/tests/CameraServiceTest/CameraServiceTest.cpp diff --git a/libs/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk similarity index 100% rename from libs/surfaceflinger/Android.mk rename to services/surfaceflinger/Android.mk diff --git a/libs/surfaceflinger/Barrier.h b/services/surfaceflinger/Barrier.h similarity index 100% rename from libs/surfaceflinger/Barrier.h rename to services/surfaceflinger/Barrier.h diff --git a/libs/surfaceflinger/BlurFilter.cpp b/services/surfaceflinger/BlurFilter.cpp similarity index 100% rename from libs/surfaceflinger/BlurFilter.cpp rename to services/surfaceflinger/BlurFilter.cpp diff --git a/libs/surfaceflinger/BlurFilter.h b/services/surfaceflinger/BlurFilter.h similarity index 100% rename from libs/surfaceflinger/BlurFilter.h rename to services/surfaceflinger/BlurFilter.h diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp similarity index 100% rename from libs/surfaceflinger/DisplayHardware/DisplayHardware.cpp rename to services/surfaceflinger/DisplayHardware/DisplayHardware.cpp diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardware.h b/services/surfaceflinger/DisplayHardware/DisplayHardware.h similarity index 100% rename from libs/surfaceflinger/DisplayHardware/DisplayHardware.h rename to services/surfaceflinger/DisplayHardware/DisplayHardware.h diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp similarity index 100% rename from libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp rename to services/surfaceflinger/DisplayHardware/DisplayHardwareBase.cpp diff --git a/libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.h b/services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h similarity index 100% rename from libs/surfaceflinger/DisplayHardware/DisplayHardwareBase.h rename to services/surfaceflinger/DisplayHardware/DisplayHardwareBase.h diff --git a/libs/surfaceflinger/GLExtensions.cpp b/services/surfaceflinger/GLExtensions.cpp similarity index 100% rename from libs/surfaceflinger/GLExtensions.cpp rename to services/surfaceflinger/GLExtensions.cpp diff --git a/libs/surfaceflinger/GLExtensions.h b/services/surfaceflinger/GLExtensions.h similarity index 100% rename from libs/surfaceflinger/GLExtensions.h rename to services/surfaceflinger/GLExtensions.h diff --git a/libs/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp similarity index 100% rename from libs/surfaceflinger/Layer.cpp rename to services/surfaceflinger/Layer.cpp diff --git a/libs/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h similarity index 100% rename from libs/surfaceflinger/Layer.h rename to services/surfaceflinger/Layer.h diff --git a/libs/surfaceflinger/LayerBase.cpp b/services/surfaceflinger/LayerBase.cpp similarity index 100% rename from libs/surfaceflinger/LayerBase.cpp rename to services/surfaceflinger/LayerBase.cpp diff --git a/libs/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h similarity index 100% rename from libs/surfaceflinger/LayerBase.h rename to services/surfaceflinger/LayerBase.h diff --git a/libs/surfaceflinger/LayerBlur.cpp b/services/surfaceflinger/LayerBlur.cpp similarity index 100% rename from libs/surfaceflinger/LayerBlur.cpp rename to services/surfaceflinger/LayerBlur.cpp diff --git a/libs/surfaceflinger/LayerBlur.h b/services/surfaceflinger/LayerBlur.h similarity index 100% rename from libs/surfaceflinger/LayerBlur.h rename to services/surfaceflinger/LayerBlur.h diff --git a/libs/surfaceflinger/LayerBuffer.cpp b/services/surfaceflinger/LayerBuffer.cpp similarity index 100% rename from libs/surfaceflinger/LayerBuffer.cpp rename to services/surfaceflinger/LayerBuffer.cpp diff --git a/libs/surfaceflinger/LayerBuffer.h b/services/surfaceflinger/LayerBuffer.h similarity index 100% rename from libs/surfaceflinger/LayerBuffer.h rename to services/surfaceflinger/LayerBuffer.h diff --git a/libs/surfaceflinger/LayerDim.cpp b/services/surfaceflinger/LayerDim.cpp similarity index 100% rename from libs/surfaceflinger/LayerDim.cpp rename to services/surfaceflinger/LayerDim.cpp diff --git a/libs/surfaceflinger/LayerDim.h b/services/surfaceflinger/LayerDim.h similarity index 100% rename from libs/surfaceflinger/LayerDim.h rename to services/surfaceflinger/LayerDim.h diff --git a/libs/surfaceflinger/MODULE_LICENSE_APACHE2 b/services/surfaceflinger/MODULE_LICENSE_APACHE2 similarity index 100% rename from libs/surfaceflinger/MODULE_LICENSE_APACHE2 rename to services/surfaceflinger/MODULE_LICENSE_APACHE2 diff --git a/libs/surfaceflinger/MessageQueue.cpp b/services/surfaceflinger/MessageQueue.cpp similarity index 100% rename from libs/surfaceflinger/MessageQueue.cpp rename to services/surfaceflinger/MessageQueue.cpp diff --git a/libs/surfaceflinger/MessageQueue.h b/services/surfaceflinger/MessageQueue.h similarity index 100% rename from libs/surfaceflinger/MessageQueue.h rename to services/surfaceflinger/MessageQueue.h diff --git a/libs/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp similarity index 100% rename from libs/surfaceflinger/SurfaceFlinger.cpp rename to services/surfaceflinger/SurfaceFlinger.cpp diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h similarity index 100% rename from libs/surfaceflinger/SurfaceFlinger.h rename to services/surfaceflinger/SurfaceFlinger.h diff --git a/libs/surfaceflinger/TextureManager.cpp b/services/surfaceflinger/TextureManager.cpp similarity index 100% rename from libs/surfaceflinger/TextureManager.cpp rename to services/surfaceflinger/TextureManager.cpp diff --git a/libs/surfaceflinger/TextureManager.h b/services/surfaceflinger/TextureManager.h similarity index 100% rename from libs/surfaceflinger/TextureManager.h rename to services/surfaceflinger/TextureManager.h diff --git a/libs/surfaceflinger/Transform.cpp b/services/surfaceflinger/Transform.cpp similarity index 100% rename from libs/surfaceflinger/Transform.cpp rename to services/surfaceflinger/Transform.cpp diff --git a/libs/surfaceflinger/Transform.h b/services/surfaceflinger/Transform.h similarity index 100% rename from libs/surfaceflinger/Transform.h rename to services/surfaceflinger/Transform.h diff --git a/libs/surfaceflinger/clz.cpp b/services/surfaceflinger/clz.cpp similarity index 100% rename from libs/surfaceflinger/clz.cpp rename to services/surfaceflinger/clz.cpp diff --git a/libs/surfaceflinger/clz.h b/services/surfaceflinger/clz.h similarity index 100% rename from libs/surfaceflinger/clz.h rename to services/surfaceflinger/clz.h diff --git a/libs/surfaceflinger/tests/Android.mk b/services/surfaceflinger/tests/Android.mk similarity index 100% rename from libs/surfaceflinger/tests/Android.mk rename to services/surfaceflinger/tests/Android.mk diff --git a/libs/surfaceflinger/tests/overlays/Android.mk b/services/surfaceflinger/tests/overlays/Android.mk similarity index 100% rename from libs/surfaceflinger/tests/overlays/Android.mk rename to services/surfaceflinger/tests/overlays/Android.mk diff --git a/libs/surfaceflinger/tests/overlays/overlays.cpp b/services/surfaceflinger/tests/overlays/overlays.cpp similarity index 100% rename from libs/surfaceflinger/tests/overlays/overlays.cpp rename to services/surfaceflinger/tests/overlays/overlays.cpp diff --git a/libs/surfaceflinger/tests/resize/Android.mk b/services/surfaceflinger/tests/resize/Android.mk similarity index 100% rename from libs/surfaceflinger/tests/resize/Android.mk rename to services/surfaceflinger/tests/resize/Android.mk diff --git a/libs/surfaceflinger/tests/resize/resize.cpp b/services/surfaceflinger/tests/resize/resize.cpp similarity index 100% rename from libs/surfaceflinger/tests/resize/resize.cpp rename to services/surfaceflinger/tests/resize/resize.cpp