commit 415bd032561d078720642d52e28fd3bc9d5155d4
author Nabil Wadih <nwadih@google.com> Mon Apr 22 15:17:29 2024 -0700
committer Nabil Wadih <nwadih@google.com> Mon Apr 22 22:55:29 2024 +0000
tree 1481e23d0c86502c0071809496f32c95b5ab335f
parent f5782a1f302bbc0dba211d8b7796380a154c7381

Update build rules include paths

Change-Id: I907425e5b21b3e8081ab84a8de9d858b067d2757

BUILD

diff --git a/BUILD b/BUILD
index 956e69a..d26eb23 100644
--- a/BUILD
+++ b/BUILD
@@ -27,37 +27,34 @@
     name = "np_cpp_ffi",
     srcs = ["nearby/presence/np_cpp_ffi/nearby_protocol.cc"],
     hdrs = ["nearby/presence/np_cpp_ffi/include/nearby_protocol.h"],
-    copts = [
-        "-Inearby/presence/np_cpp_ffi/include",
-        "-Inearby/presence/np_c_ffi/include/cpp",
+    includes = [
+        "nearby/presence/np_c_ffi/include/cpp",
+        "nearby/presence/np_cpp_ffi/include",
     ],
     visibility = ["//visibility:public"],
     deps = [
         ":np_c_ffi",
-        "@absl//absl/status",
-        "@absl//absl/status:statusor",
-        "@absl//absl/strings",
-        "@absl//absl/strings:str_format",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
     ],
 )
 
 cc_library(
     name = "np_c_ffi_types",
     hdrs = ["nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h"],
+    includes = ["nearby/presence/np_c_ffi/include/cpp/"],
     visibility = ["//visibility:public"],
 )
 
 cc_binary(
     name = "np_cpp_sample",
     srcs = ["nearby/presence/np_cpp_ffi/sample/main.cc"],
-    copts = [
-        "-Inearby/presence/np_c_ffi/include/cpp",
-        "-Inearby/presence/np_cpp_ffi/include",
-    ],
     deps = [
         ":np_c_ffi_types",
         ":np_cpp_ffi",
-        "@absl//absl/strings",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -67,6 +64,7 @@
         "nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_functions.h",
         "nearby/presence/np_c_ffi/include/cpp/np_cpp_ffi_types.h",
     ],
+    includes = ["nearby/presence/np_cpp_ffi/include/cpp"],
     deps = [":np_c_ffi_rust"],
 )
 

MODULE.bazel

diff --git a/MODULE.bazel b/MODULE.bazel
index 7c969b1..20bd352 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -10,7 +10,7 @@
 bazel_dep(name = "rules_rust", version = "0.42.1")
 
 git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-git_repository(name = "absl", remote = "https://github.com/abseil/abseil-cpp.git", commit = "d87dc03cee90a0cac2dbf254217b346ca693bb83")
+git_repository(name = "com_google_absl", remote = "https://github.com/abseil/abseil-cpp.git", commit = "d87dc03cee90a0cac2dbf254217b346ca693bb83")
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(

MODULE.bazel.lock

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 2718369..b75433b 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@
 {
   "lockFileVersion": 6,
-  "moduleFileHash": "1fa293cc028a8a6075af8096e19c15e75ab84c05597e5172020a6da8564995af",
+  "moduleFileHash": "78832c474ed0f0b328c52d96604ff16b984ece2e83e6aea659f994755450d661",
   "flags": {
     "cmdRegistries": [
       "https://bcr.bazel.build/"
@@ -36,7 +36,7 @@
             "column": 0
           },
           "imports": {
-            "absl": "absl"
+            "com_google_absl": "com_google_absl"
           },
           "devImports": [],
           "tags": [
@@ -45,7 +45,7 @@
               "attributeValues": {
                 "remote": "https://github.com/abseil/abseil-cpp.git",
                 "commit": "d87dc03cee90a0cac2dbf254217b346ca693bb83",
-                "name": "absl"
+                "name": "com_google_absl"
               },
               "devDependency": false,
               "location": {