Fix bazel/gradle compilation conflict #24
Conversation
|
I am happy to split the PR in multiple pieces if is preferred |
|
also this repo requires some CI steps to validate the build. quite a few steps are broken after the introduction of bazel as seen from this and my previous PR. would you accept a PR to add github actions to build and test the code? |
i was actually thinking of doing this as well, so i absolutely would accept a pr for that! |
| @@ -50,6 +51,7 @@ | |||
| public class Ukey2ShellCppWrapper { | |||
| // The path the the ukey2_shell binary. | |||
| private static final String BINARY_PATH = "build/src/main/cpp/src/securegcm/ukey2_shell"; | |||
There was a problem hiding this comment.
we don't build w cmake anymore, so this should probably be removed.
There was a problem hiding this comment.
Are you planning to support only bazel for the c++ library and gradle for java?
There was a problem hiding this comment.
yep, since this is built as part of https://github.com/google/nearby, so that's why a lot of this stuff wasn't updated correctly (my bad!)
Renames BUILD file from bazel to
BUILD.bazelto solve a conflict with thebuildfolder created by gradle. probably is worth to rename all the bazelBUILDfiles?Allows Ukey2ShellCppWrapper.java to use the
ukey2_shellbinary from the default output folder of bazelUpgrade protobuf to 0.9.3. From 0.9.1 changelog :
This was causing the generation of proto fail given the proto folder contains a bazel
BUILDfileadds
.DS_Storein the .gitignore to ignore .DS_Store files generated on macadds the missing empty line from last commit Fix Bazel support to compile C++ library #23 (comment)