[Ozone] Update GYP and GN to include a DRM platform

This makes it possible to refer to the platform as DRI and DRM. We need
this intermediate state so we can update the CrOS builds to use DRM
rather than DRI.

BUG=none
TEST=Build ozone with DRI & DRM platform and without to verify build
(GYP and GN)

Review URL: https://codereview.chromium.org/957253005

Cr-Commit-Position: refs/heads/master@{#320788}

11 files changed, 23 insertions, 10 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 0b9f1df..61224ba 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1497,6 +1497,7 @@
     # Ozone platforms to include in the build.
     'ozone_platform_caca%': 0,
     'ozone_platform_dri%': 0,
+    'ozone_platform_drm%': 0,
     'ozone_platform_egltest%': 0,
     'ozone_platform_gbm%': 0,
     'ozone_platform_ozonex%': 0,
@@ -2347,6 +2348,7 @@
         # Build all platforms whose deps are in install-build-deps.sh.
         # Only these platforms will be compile tested by buildbots.
         'ozone_platform_dri%': 1,
+        'ozone_platform_drm%': 1,
         'ozone_platform_test%': 1,
         'ozone_platform_egltest%': 1,
       }],
diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi
index bc657d8..48c8027 100644
--- a/build/filename_rules.gypi
+++ b/build/filename_rules.gypi
@@ -106,11 +106,6 @@
                     ['exclude', '(^|/)evdev/'],
       ]
     }],
-    ['<(ozone_platform_dri)==0 or >(nacl_untrusted_build)==1', {
-      'sources/': [ ['exclude', '_dri(_browsertest|_unittest)?\\.(h|cc)$'],
-                    ['exclude', '(^|/)dri/'],
-      ]
-    }],
     ['<(use_pango)==0', {
       'sources/': [ ['exclude', '(^|_)pango(_util|_browsertest|_unittest)?\\.(h|cc)$'], ],
     }],
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index a71a5c5..59fc13a 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -508,7 +508,7 @@
         },
       ],
     }],
-    ['ozone_platform_dri==1 or ozone_platform_gbm==1', {
+    ['ozone_platform_dri==1 or ozone_platform_drm==1 or ozone_platform_gbm==1', {
       'targets': [
         {
           'target_name': 'libdrm',
diff --git a/media/ozone/media_ozone_platform.cc b/media/ozone/media_ozone_platform.cc
index aaf00ab..dcbc2f2 100644
--- a/media/ozone/media_ozone_platform.cc
+++ b/media/ozone/media_ozone_platform.cc
@@ -36,6 +36,10 @@ MediaOzonePlatform* CreateMediaOzonePlatformDri() {
   return new MediaOzonePlatformStub;
 }
 
+MediaOzonePlatform* CreateMediaOzonePlatformDrm() {
+  return new MediaOzonePlatformStub;
+}
+
 MediaOzonePlatform* CreateMediaOzonePlatformEgltest() {
   return new MediaOzonePlatformStub;
 }
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index 2fbc1f3..ff40d8f 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -29,8 +29,11 @@ if (ozone_platform_caca) {
   ozone_platform_deps += [ "platform/caca" ]
 }
 
-if (ozone_platform_dri) {
-  ozone_platforms += [ "dri" ]
+if (ozone_platform_dri || ozone_platform_drm) {
+  ozone_platforms += [
+    "dri",
+    "drm",
+  ]
   ozone_platform_deps += [ "platform/drm" ]
   ozone_platform_test_deps += [ "platform/drm:drm_unittests" ]
 }
diff --git a/ui/ozone/ozone.gni b/ui/ozone/ozone.gni
index 867813c..8556cee 100644
--- a/ui/ozone/ozone.gni
+++ b/ui/ozone/ozone.gni
@@ -14,6 +14,7 @@ declare_args() {
   # Enable individual platforms.
   ozone_platform_caca = false
   ozone_platform_dri = false
+  ozone_platform_drm = false
   ozone_platform_egltest = false
   ozone_platform_gbm = false
   ozone_platform_test = false
@@ -25,6 +26,7 @@ declare_args() {
     # Build all platforms whose deps are in install-build-deps.sh.
     # Only these platforms will be compile tested by buildbots.
     ozone_platform_dri = true
+    ozone_platform_drm = true
     ozone_platform_test = true
     ozone_platform_egltest = true
   }
diff --git a/ui/ozone/ozone.gyp b/ui/ozone/ozone.gyp
index 346b3db..c431d3c 100644
--- a/ui/ozone/ozone.gyp
+++ b/ui/ozone/ozone.gyp
@@ -196,7 +196,7 @@
         'platform/caca/caca.gypi',
       ],
     }],
-    ['<(ozone_platform_dri) == 1 or <(ozone_platform_gbm) == 1', {
+    ['<(ozone_platform_dri) == 1 or <(ozone_platform_drm) == 1 or <(ozone_platform_gbm) == 1', {
       'includes': [
         'platform/drm/drm.gypi',
       ],
diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn
index d33d12c..9966144 100644
--- a/ui/ozone/platform/drm/BUILD.gn
+++ b/ui/ozone/platform/drm/BUILD.gn
@@ -101,7 +101,7 @@ source_set("drm_common") {
   public_configs = [ ":libdrm" ]
 }
 
-if (ozone_platform_dri) {
+if (ozone_platform_dri || ozone_platform_drm) {
   source_set("drm") {
     sources = [
       "ozone_platform_drm.cc",
diff --git a/ui/ozone/platform/drm/drm.gypi b/ui/ozone/platform/drm/drm.gypi
index 5cba4ff..e8fa457 100644
--- a/ui/ozone/platform/drm/drm.gypi
+++ b/ui/ozone/platform/drm/drm.gypi
@@ -12,6 +12,7 @@
     ],
     'internal_ozone_platforms': [
       'dri',
+      'drm',
     ],
   },
   'targets': [
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index d964ad4..98bba6e 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -172,4 +172,8 @@ OzonePlatform* CreateOzonePlatformDri() {
   return new OzonePlatformDrm;
 }
 
+OzonePlatform* CreateOzonePlatformDrm() {
+  return new OzonePlatformDrm;
+}
+
 }  // namespace ui
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.h b/ui/ozone/platform/drm/ozone_platform_drm.h
index c136890..5837870 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.h
+++ b/ui/ozone/platform/drm/ozone_platform_drm.h
@@ -12,6 +12,8 @@ class OzonePlatform;
 // Constructor hook for use in ozone_platform_list.cc
 OzonePlatform* CreateOzonePlatformDri();
 
+OzonePlatform* CreateOzonePlatformDrm();
+
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_OZONE_PLATFORM_DRM_H_