sync with upstreamLeia

5 files changed, 24 insertions, 19 deletions

diff --git a/cmake/treedata/android/subdirs.txt b/cmake/treedata/android/subdirs.txt
index 036fd24..53a04f0 100644
--- a/cmake/treedata/android/subdirs.txt
+++ b/cmake/treedata/android/subdirs.txt
@@ -1,17 +1,20 @@
-xbmc/cores/RetroPlayer/process/android  cores/RetroPlayer/process/android
-xbmc/input/touch                        input/touch
-xbmc/input/touch/generic                input/touch/generic
-xbmc/windowing/android                  windowing/android
-xbmc/platform/posix                     platform/posix
-xbmc/platform/posix/filesystem          platform/posix/filesystem
-xbmc/platform/posix/utils               platform/posix/utils
-xbmc/platform/linux                     platform/linux
-xbmc/platform/linux/peripherals         platform/linux/peripherals
-xbmc/platform/android/activity          platform/android/activity
-xbmc/platform/android/bionic_supplement platform/android/bionicsupplement
-xbmc/platform/android/drm               platform/android/drm
-xbmc/platform/android/filesystem        platform/android/filesystem
-xbmc/platform/android/network           platform/android/network
-xbmc/platform/android/peripherals       platform/android/peripherals
-xbmc/platform/android/powermanagement   platform/android/powermanagement
-xbmc/platform/android/storage           platform/android/storage
+xbmc/cores/RetroPlayer/process/android      cores/RetroPlayer/process/android
+xbmc/cores/VideoPlayer/Process/android/     cores/VideoPlayer/Process/android/
+xbmc/input/touch                            input/touch
+xbmc/input/touch/generic                    input/touch/generic
+xbmc/media/decoderfilter                    media/decoderfilter
+xbmc/windowing/android                      windowing/android
+xbmc/platform/posix                         platform/posix
+xbmc/platform/posix/filesystem              platform/posix/filesystem
+xbmc/platform/posix/utils                   platform/posix/utils
+xbmc/platform/linux                         platform/linux
+xbmc/platform/linux/peripherals             platform/linux/peripherals
+xbmc/platform/android/activity              platform/android/activity
+xbmc/platform/android/bionic_supplement     platform/android/bionicsupplement
+xbmc/platform/android/media/drm             platform/android/media/drm
+xbmc/platform/android/media/decoderfilter   platform/android/media/decoderfilter
+xbmc/platform/android/filesystem            platform/android/filesystem
+xbmc/platform/android/network               platform/android/network
+xbmc/platform/android/peripherals           platform/android/peripherals
+xbmc/platform/android/powermanagement       platform/android/powermanagement
+xbmc/platform/android/storage               platform/android/storage
diff --git a/cmake/treedata/common/drm.txt b/cmake/treedata/common/drm.txt
deleted file mode 100644
index fbcc906..0000000
--- a/cmake/treedata/common/drm.txt
+++ /dev/null
@@ -1 +0,0 @@
-xbmc/drm drm
diff --git a/cmake/treedata/common/media.txt b/cmake/treedata/common/media.txt
new file mode 100644
index 0000000..519fece
--- /dev/null
+++ b/cmake/treedata/common/media.txt
@@ -0,0 +1,2 @@
+xbmc/media                                      media
+xbmc/media/drm                                  drm
diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
index 368f473..083e8ef 100644
--- a/cmake/treedata/common/subdirs.txt
+++ b/cmake/treedata/common/subdirs.txt
@@ -20,6 +20,7 @@ xbmc/favourites                                 favourites
 xbmc/guilib                                     guilib
 xbmc/guilib/guiinfo                             guilib_guiinfo
 xbmc/input                                      input
+xbmc/input/actions                              input/actions
 xbmc/input/joysticks                            input/joysticks
 xbmc/input/joysticks/dialogs                    input/joysticks/dialogs
 xbmc/input/joysticks/generic                    input/joysticks/generic
@@ -29,7 +30,6 @@ xbmc/input/keyboard/generic                     input/keyboard/generic
 xbmc/input/mouse                                input/mouse
 xbmc/input/mouse/generic                        input/mouse/generic
 xbmc/listproviders                              listproviders
-xbmc/media                                      media
 xbmc/messaging                                  messaging
 xbmc/messaging/helpers                          messagingHelpers
 xbmc/pictures                                   pictures
diff --git a/cmake/treedata/common/tests.txt b/cmake/treedata/common/tests.txt
index 358bc4d..6889cc1 100644
--- a/cmake/treedata/common/tests.txt
+++ b/cmake/treedata/common/tests.txt
@@ -4,6 +4,7 @@ xbmc/filesystem/test              test/filesystem
 xbmc/interfaces/python/test       test/python
 xbmc/music/tags/test              test/music_tags
 xbmc/network/test                 test/network
+xbmc/playlists/test               test/playlists
 xbmc/threads/test                 test/threads
 xbmc/utils/test                   test/utils
 xbmc/video/test                   test/video