From b967a4c3812313a7ea972efbc0764a8a52a59e11 Mon Sep 17 00:00:00 2001
From: Peiyong Lin <lpy@google.com>
Date: Mon, 27 Jul 2020 22:16:13 -0700
Subject: Use more inclusive terms inside GraphicsEnvironment.

Bug: b/162288333
Test: N/A
Change-Id: I2f1f13a892be0c8ff3f89e0ceabe39058390727d
---
 graphics/proto/Android.bp             |  6 +++---
 graphics/proto/game_driver.proto      | 31 -------------------------------
 graphics/proto/updatable_driver.proto | 31 +++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 graphics/proto/game_driver.proto
 create mode 100644 graphics/proto/updatable_driver.proto

(limited to 'graphics')

diff --git a/graphics/proto/Android.bp b/graphics/proto/Android.bp
index ddced597759f..ea79b731a365 100644
--- a/graphics/proto/Android.bp
+++ b/graphics/proto/Android.bp
@@ -1,10 +1,10 @@
 java_library_static {
-    name: "game-driver-protos",
+    name: "updatable-driver-protos",
     host_supported: true,
     proto: {
         type: "lite",
     },
-    srcs: ["game_driver.proto"],
+    srcs: ["updatable_driver.proto"],
     jarjar_rules: "jarjar-rules.txt",
-    sdk_version: "28",
+    sdk_version: "30",
 }
diff --git a/graphics/proto/game_driver.proto b/graphics/proto/game_driver.proto
deleted file mode 100644
index fd7ffccac24c..000000000000
--- a/graphics/proto/game_driver.proto
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto2";
-
-package android.gamedriver;
-
-option java_package = "android.gamedriver";
-option java_outer_classname = "GameDriverProto";
-
-message Blacklist {
-    optional int64 version_code = 1;
-    repeated string package_names = 2;
-}
-
-message Blacklists {
-    repeated Blacklist blacklists = 1;
-}
diff --git a/graphics/proto/updatable_driver.proto b/graphics/proto/updatable_driver.proto
new file mode 100644
index 000000000000..cbc9424854d1
--- /dev/null
+++ b/graphics/proto/updatable_driver.proto
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+syntax = "proto2";
+
+package android.updatabledriver;
+
+option java_package = "android.updatabledriver";
+option java_outer_classname = "UpdatableDriverProto";
+
+message Denylist {
+    optional int64 version_code = 1;
+    repeated string package_names = 2;
+}
+
+message Denylists {
+    repeated Denylist denylists = 1;
+}
-- 
cgit v1.2.3