diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:15:39 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2019-01-17 12:15:39 -0800 |
commit | e5ccbdcdd02fba915bdac60a290c824ca2e5ef53 (patch) | |
tree | 3fe7de7a1092bba2b795e13231676e62e43fc130 /tools | |
parent | 9ea6bb467810b958c8c2fb0bcf96d0af2b243801 (diff) | |
parent | c7870e0f77d6331babfdb89f8c83e4e0279b5e70 (diff) |
Merge branch 'master' into arrayapi
Diffstat (limited to 'tools')
-rw-r--r-- | tools/dump_cinit.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/dump_cinit.lua b/tools/dump_cinit.lua index 34d9dd1..34d6ac6 100644 --- a/tools/dump_cinit.lua +++ b/tools/dump_cinit.lua @@ -351,6 +351,7 @@ end local function well_known_type(m) local type_map = {} type_map["google.protobuf.Any"] = "UPB_WELLKNOWN_ANY" + type_map["google.protobuf.FieldMask"] = "UPB_WELLKNOWN_FIELDMASK" type_map["google.protobuf.Duration"] = "UPB_WELLKNOWN_DURATION" type_map["google.protobuf.Timestamp"] = "UPB_WELLKNOWN_TIMESTAMP" type_map["google.protobuf.Value"] = "UPB_WELLKNOWN_VALUE" |