[Ozone] Remove deprecated DRI platform name

The platform was renamed to DRM. The DRI name was left in place until
the ChromeOS changes were done.

BUG=none

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

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

7 files changed, 5 insertions, 13 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 67eb8ac..a2af2d3 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1526,7 +1526,6 @@
     # Ozone platforms to include in the build.
     'ozone_platform_caca%': 0,
     'ozone_platform_cast%': 0,
-    'ozone_platform_dri%': 0,
     'ozone_platform_drm%': 0,
     'ozone_platform_egltest%': 0,
     'ozone_platform_gbm%': 0,
@@ -2370,7 +2369,6 @@
 
         # 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/linux/system.gyp b/build/linux/system.gyp
index a1d6bf0..ab20951 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -524,7 +524,7 @@
         },
       ],
     }],
-    ['ozone_platform_dri==1 or ozone_platform_drm==1 or ozone_platform_gbm==1', {
+    ['ozone_platform_drm==1 or ozone_platform_gbm==1', {
       'targets': [
         {
           'target_name': 'libdrm',
diff --git a/ui/ozone/BUILD.gn b/ui/ozone/BUILD.gn
index cdec05f..fa633c6 100644
--- a/ui/ozone/BUILD.gn
+++ b/ui/ozone/BUILD.gn
@@ -29,11 +29,8 @@ if (ozone_platform_caca) {
   ozone_platform_deps += [ "platform/caca" ]
 }
 
-if (ozone_platform_dri || ozone_platform_drm) {
-  ozone_platforms += [
-    "dri",
-    "drm",
-  ]
+if (ozone_platform_drm) {
+  ozone_platforms += [ "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 8556cee..35db157 100644
--- a/ui/ozone/ozone.gni
+++ b/ui/ozone/ozone.gni
@@ -13,7 +13,6 @@ 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
@@ -25,7 +24,6 @@ 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 67f1a7e..d6086dd 100644
--- a/ui/ozone/ozone.gyp
+++ b/ui/ozone/ozone.gyp
@@ -203,7 +203,7 @@
         'platform/cast/cast.gypi',
       ],
     }],
-    ['<(ozone_platform_dri) == 1 or <(ozone_platform_drm) == 1 or <(ozone_platform_gbm) == 1', {
+    ['<(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 9f447a2..42d8cc7 100644
--- a/ui/ozone/platform/drm/BUILD.gn
+++ b/ui/ozone/platform/drm/BUILD.gn
@@ -116,7 +116,7 @@ source_set("drm_common") {
   public_configs = [ ":libdrm" ]
 }
 
-if (ozone_platform_dri || ozone_platform_drm) {
+if (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 8affc20..11a9eed 100644
--- a/ui/ozone/platform/drm/drm.gypi
+++ b/ui/ozone/platform/drm/drm.gypi
@@ -11,7 +11,6 @@
       'ozone_platform_drm_unittests',
     ],
     'internal_ozone_platforms': [
-      'dri',
       'drm',
     ],
     'use_drm_atomic%': 0,