« back to all changes in this revision
Viewing changes to 3rd_party/CMakeLists.txt
- Committer: Gerry Boland
- Date: 2013-05-10 17:47:40 UTC
- mfrom: (603.39.69 android-internal-client)
- Revision ID: gerry.boland@canonical.com-20130510174740-u6i2uvg50robs7ti
Merged trunk and fixed issues
- files added:
- 3rd_party/android-deps/std/MirLog.h
- examples/demo-inprocess-egl
- files removed:
- 3rd_party/android-deps/androidfw/Platform.h
- 3rd_party/android-input/android/frameworks/base/libs/androidfw
- 3rd_party/android-input/android/frameworks/native/include/android
- 3rd_party/android-input/android/hardware/libhardware_legacy/power
- 3rd_party/android-input/android/system/core/include/sys
- 3rd_party/android-input/android/system/core/include/system
- 3rd_party/android-input/android/system/core/libcutils
- 3rd_party/android-input/android/system/core/liblog
- 3rd_party/android-input/android/system/extras
- 3rd_party/android-input/android/system/extras/ext4_utils
- 3rd_party/android-input/android_pristine
- 3rd_party/android-input/android_pristine/external
- 3rd_party/android-input/android_pristine/external/kernel-headers
- 3rd_party/android-input/android_pristine/external/kernel-headers/original
- 3rd_party/android-input/android_pristine/external/kernel-headers/original/linux
- 3rd_party/android-input/android_pristine/frameworks
- 3rd_party/android-input/android_pristine/frameworks/base
- 3rd_party/android-input/android_pristine/frameworks/base/include
- 3rd_party/android-input/android_pristine/frameworks/base/include/androidfw
- 3rd_party/android-input/android_pristine/frameworks/base/libs
- 3rd_party/android-input/android_pristine/frameworks/base/libs/androidfw
- 3rd_party/android-input/android_pristine/frameworks/base/services
- 3rd_party/android-input/android_pristine/frameworks/base/services/input
- 3rd_party/android-input/android_pristine/frameworks/native
- 3rd_party/android-input/android_pristine/frameworks/native/include
- 3rd_party/android-input/android_pristine/frameworks/native/include/android
- 3rd_party/android-input/android_pristine/frameworks/native/include/private
- 3rd_party/android-input/android_pristine/frameworks/native/include/private/utils
- 3rd_party/android-input/android_pristine/frameworks/native/include/utils
- 3rd_party/android-input/android_pristine/frameworks/native/libs
- 3rd_party/android-input/android_pristine/frameworks/native/libs/utils
- 3rd_party/android-input/android_pristine/hardware
- 3rd_party/android-input/android_pristine/hardware/libhardware_legacy
- 3rd_party/android-input/android_pristine/hardware/libhardware_legacy/include
- 3rd_party/android-input/android_pristine/hardware/libhardware_legacy/include/hardware_legacy
- 3rd_party/android-input/android_pristine/hardware/libhardware_legacy/include/hardware_legacy/power.h
- 3rd_party/android-input/android_pristine/hardware/libhardware_legacy/power
- 3rd_party/android-input/android_pristine/system
- 3rd_party/android-input/android_pristine/system/core
- 3rd_party/android-input/android_pristine/system/core/include
- 3rd_party/android-input/android_pristine/system/core/include/android
- 3rd_party/android-input/android_pristine/system/core/include/arch
- 3rd_party/android-input/android_pristine/system/core/include/arch/linux-x86
- 3rd_party/android-input/android_pristine/system/core/include/corkscrew
- 3rd_party/android-input/android_pristine/system/core/include/cutils
- 3rd_party/android-input/android_pristine/system/core/include/sys
- 3rd_party/android-input/android_pristine/system/core/include/system
- 3rd_party/android-input/android_pristine/system/core/libcutils
- 3rd_party/android-input/android_pristine/system/core/liblog
- 3rd_party/android-input/android_pristine/system/extras
- 3rd_party/android-input/android_pristine/system/extras/ext4_utils
- 3rd_party/glm
- 3rd_party/glm/glm
- 3rd_party/glm/glm/core
- 3rd_party/glm/glm/gtc
- 3rd_party/glm/glm/gtx
- 3rd_party/glm/glm/virtrev
- examples/demo-inprocess-surface-client
- include/server/mir/graphics/egl
- src/server/graphics/egl
- tests/unit-tests/graphics/egl
- files renamed:
- tests/unit-tests/graphics/gbm/mock_gbm.h => include/test/mir_test_doubles/mock_gbm.h
- src/server/graphics/egl/mesa_native_display.cpp => src/server/graphics/gbm/internal_native_display.cpp
- tests/unit-tests/graphics/gbm/mock_gbm.cpp => tests/mir_test_doubles/mock_gbm.cpp
- tests/unit-tests/graphics/egl/test_mirserver_mesa_egl_native_display.cpp => tests/unit-tests/graphics/gbm/test_internal_native_display.cpp
- files modified:
- 3rd_party/CMakeLists.txt
added
removed
3rd_party/CMakeLists.txt
