Merge branch 'master' into defcleanup

BUILD

@@ -124,6 +124,7 @@ cc_library(
     ],
     hdrs = ["upbc/generator.h"],
     deps = [
+        map_dep("@absl//absl/base:core_headers"),
         map_dep("@absl//absl/strings"),
         map_dep("@com_google_protobuf//:protobuf"),
         map_dep("@com_google_protobuf//:protoc_lib"),
@@ -416,6 +417,17 @@ py_binary(
     srcs = ["tools/make_cmakelists.py"],
 )
 
+genrule(
+    name = "gen_cmakelists",
+    srcs = [
+        "BUILD",
+        "WORKSPACE",
+    ],
+    outs = ["generated/CMakeLists.txt"],
+    cmd = "$(location :make_cmakelists) $@",
+    tools = [":make_cmakelists"],
+)
+
 proto_library(
     name = "descriptor_proto",
     srcs = [
@@ -430,17 +442,6 @@ genrule(
     cmd = "cp $< $@",
 )
 
-genrule(
-    name = "gen_cmakelists",
-    srcs = [
-        "BUILD",
-        "WORKSPACE",
-    ],
-    outs = ["generated/CMakeLists.txt"],
-    cmd = "$(location :make_cmakelists) $@",
-    tools = [":make_cmakelists"],
-)
-
 proto_library(
     name = "google_descriptor_proto",
     srcs = [

build_defs.bzl

@@ -210,6 +210,7 @@ upb_amalgamation = rule(
 is_bazel = not hasattr(native, "genmpm")
 
 google3_dep_map = {
+    "@absl//absl/base:core_headers": "//third_party/absl/base:core_headers",
     "@absl//absl/strings": "//third_party/absl/strings",
     "@com_google_protobuf//:protoc": "//third_party/protobuf:protoc",
     "@com_google_protobuf//:protobuf": "//third_party/protobuf:protobuf",

kokoro/ubuntu/build.sh

@@ -3,6 +3,11 @@
 # Install the latest version of Bazel.
 use_bazel.sh latest
 
+# Verify/query CMake
+echo PATH=$PATH
+ls -l `which cmake`
+cmake --version
+
 # Log the bazel path and version.
 which bazel
 bazel version