Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify tags on intermediate targets #18

Merged
merged 1 commit into from
Oct 23, 2021
+7 −15
Merged

Simplify tags on intermediate targets #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/rules.md
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ cc_library(
## java_library_with_native

<pre>
java_library_with_native(<a href="#java_library_with_native-name">name</a>, <a href="#java_library_with_native-visibility">visibility</a>, <a href="#java_library_with_native-native_libs">native_libs</a>, <a href="#java_library_with_native-tags">tags</a>, <a href="#java_library_with_native-java_library_args">java_library_args</a>)
java_library_with_native(<a href="#java_library_with_native-name">name</a>, <a href="#java_library_with_native-native_libs">native_libs</a>, <a href="#java_library_with_native-tags">tags</a>, <a href="#java_library_with_native-visibility">visibility</a>, <a href="#java_library_with_native-java_library_args">java_library_args</a>)
</pre>


@@ -76,9 +76,9 @@ java_library_with_native(<a href="#java_library_with_native-name">name</a>, <a h
| Name | Description | Default Value |
| :------------- | :------------- | :------------- |
| <a id="java_library_with_native-name"></a>name | <p align="center"> - </p> | none |
| <a id="java_library_with_native-visibility"></a>visibility | <p align="center"> - </p> | <code>None</code> |
| <a id="java_library_with_native-native_libs"></a>native_libs | <p align="center"> - </p> | <code>None</code> |
| <a id="java_library_with_native-tags"></a>tags | <p align="center"> - </p> | <code>None</code> |
| <a id="java_library_with_native-visibility"></a>visibility | <p align="center"> - </p> | <code>None</code> |
| <a id="java_library_with_native-java_library_args"></a>java_library_args | <p align="center"> - </p> | none |


8 changes: 2 additions & 6 deletions jni/internal/java_library_with_native.bzl
View file
Original file line number Diff line number Diff line change
@@ -16,23 +16,19 @@ load(":common.bzl", "merge_java_infos", "original_java_library_name")

def java_library_with_native(
name,
visibility = None,
native_libs = None,
tags = None,
visibility = None,
**java_library_args):
original_name = original_java_library_name(name)

# Simple concatenation is compatible with select, append is not.
java_library_args.setdefault("deps", [])
java_library_args["deps"] += ["@fmeum_rules_jni//jni/tools/native_loader"]

java_library_args.setdefault("tags", [])
if tags:
java_library_args["tags"] += tags
if "manual" not in java_library_args["tags"]:
java_library_args["tags"].append("manual")
native.java_library(
name = original_name,
tags = ["manual"],
visibility = visibility,
**java_library_args
)
10 changes: 3 additions & 7 deletions jni/internal/java_native_library.bzl
View file
Original file line number Diff line number Diff line change
@@ -226,13 +226,6 @@ def java_native_library(
unix_library_name = "lib%s.so" % name
windows_library_name = "%s.dll" % name

# Label cc_binary targets as manual as they should not be built
# unnecessarily in the untransitioned configuration.
cc_binary_args.setdefault("tags", [])
if tags:
cc_binary_args["tags"] += tags
if "manual" not in cc_binary_args["tags"]:
cc_binary_args["tags"].append("manual")
cc_binary_args.setdefault("deps", [])

# Simple concatenation is compatible with select, append is not.
@@ -245,20 +238,23 @@ def java_native_library(
name = macos_library_name,
linkshared = True,
linkstatic = True,
tags = ["manual"],
visibility = ["//visibility:private"],
**cc_binary_args
)
native.cc_binary(
name = unix_library_name,
linkshared = True,
linkstatic = True,
tags = ["manual"],
visibility = ["//visibility:private"],
**cc_binary_args
)
native.cc_binary(
name = windows_library_name,
linkshared = True,
linkstatic = True,
tags = ["manual"],
visibility = ["//visibility:private"],
**cc_binary_args
)