Moved legacy_msg_reflection.{c,h} -> reflection.{c.h}.
diff --git a/BUILD b/BUILD
index a9a421f..dd72362 100644
--- a/BUILD
+++ b/BUILD
@@ -116,10 +116,12 @@
srcs = [
"upb/def.c",
"upb/msgfactory.c",
+ "upb/reflection.c",
],
hdrs = [
"upb/def.h",
"upb/msgfactory.h",
+ "upb/reflection.h",
],
copts = select({
":windows": [],
@@ -144,23 +146,6 @@
# Legacy C/C++ Libraries (not recommended for new code) ########################
cc_library(
- name = "legacy_msg_reflection",
- srcs = [
- "upb/legacy_msg_reflection.c",
- ],
- hdrs = ["upb/legacy_msg_reflection.h"],
- copts = select({
- ":windows": [],
- "//conditions:default": COPTS
- }),
- deps = [
- ":table",
- ":upb",
- ":reflection",
- ],
-)
-
-cc_library(
name = "handlers",
srcs = [
"upb/handlers.c",
@@ -592,7 +577,7 @@
"upb/bindings/lua/upb.h",
],
deps = [
- "legacy_msg_reflection",
+ "reflection",
"upb",
"upb_pb",
],
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1975238..2393ded 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,10 @@
add_library(reflection
upb/def.c
upb/msgfactory.c
+ upb/reflection.c
upb/def.h
- upb/msgfactory.h)
+ upb/msgfactory.h
+ upb/reflection.h)
target_link_libraries(reflection
descriptor_upbproto
table
@@ -90,13 +92,6 @@
add_library(table INTERFACE)
target_link_libraries(table INTERFACE
upb)
-add_library(legacy_msg_reflection
- upb/legacy_msg_reflection.c
- upb/legacy_msg_reflection.h)
-target_link_libraries(legacy_msg_reflection
- table
- upb
- reflection)
add_library(handlers
upb/handlers.c
upb/handlers-inl.h
diff --git a/upb/bindings/lua/msg.c b/upb/bindings/lua/msg.c
index 2d747a3..49c7d3f 100644
--- a/upb/bindings/lua/msg.c
+++ b/upb/bindings/lua/msg.c
@@ -2,6 +2,8 @@
** lupb_msg -- Message/Array/Map objects in Lua/C that wrap upb/msg.h
*/
+#include "upb/msg.h"
+
#include <float.h>
#include <math.h>
#include <stddef.h>
@@ -11,10 +13,8 @@
#include "lauxlib.h"
#include "upb/bindings/lua/upb.h"
#include "upb/handlers.h"
-#include "upb/legacy_msg_reflection.h"
-#include "upb/msg.h"
-
#include "upb/port_def.inc"
+#include "upb/reflection.h"
/*
* Message/Array/Map objects can be constructed in one of two ways:
diff --git a/upb/legacy_msg_reflection.c b/upb/reflection.c
similarity index 99%
rename from upb/legacy_msg_reflection.c
rename to upb/reflection.c
index 4f1ab97..70ab323 100644
--- a/upb/legacy_msg_reflection.c
+++ b/upb/reflection.c
@@ -1,5 +1,5 @@
-#include "upb/legacy_msg_reflection.h"
+#include "upb/reflection.h"
#include <string.h>
#include "upb/table.int.h"
diff --git a/upb/legacy_msg_reflection.h b/upb/reflection.h
similarity index 100%
rename from upb/legacy_msg_reflection.h
rename to upb/reflection.h
