diff options
author | Xin Li <delphij@google.com> | 2020-10-09 11:14:30 -0700 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2020-10-10 20:38:57 -0700 |
commit | 986e6eeddf02959975e63a7cd138e70784540bf6 (patch) | |
tree | bf060846893c657436f9429650f2240f048dd0be /graphics | |
parent | 1015bae311220fe8242c33e58e11a932ed6f8a3a (diff) | |
parent | 539d92beb7ed3638107c6d90c2f6a2e8a891256d (diff) |
Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/proto/Android.bp | 6 | ||||
-rw-r--r-- | graphics/proto/updatable_driver.proto (renamed from graphics/proto/game_driver.proto) | 12 |
2 files changed, 9 insertions, 9 deletions
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/updatable_driver.proto index fd7ffccac24c..cbc9424854d1 100644 --- a/graphics/proto/game_driver.proto +++ b/graphics/proto/updatable_driver.proto @@ -16,16 +16,16 @@ syntax = "proto2"; -package android.gamedriver; +package android.updatabledriver; -option java_package = "android.gamedriver"; -option java_outer_classname = "GameDriverProto"; +option java_package = "android.updatabledriver"; +option java_outer_classname = "UpdatableDriverProto"; -message Blacklist { +message Denylist { optional int64 version_code = 1; repeated string package_names = 2; } -message Blacklists { - repeated Blacklist blacklists = 1; +message Denylists { + repeated Denylist denylists = 1; } |