Skip to content

Commit

Permalink
Explicitly use fb_core_android_library instead of android_library.
Browse files Browse the repository at this point in the history
Summary: This is to stop relying on implicit global wrappers.

Reviewed By: adamjernst

Differential Revision: D7706281

fbshipit-source-id: 16abf15a3cc4345c2a962d3894d55b03f3946aa4
  • Loading branch information
ttsugriy authored and facebook-github-bot committed Apr 20, 2018
1 parent 305521a commit 60131ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
10 changes: 6 additions & 4 deletions java/com/facebook/soloader/BUCK
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
load("//build_defs:fb_core_android_library.bzl", "fb_core_android_library")

include_defs("//oss_defs/SOLOADER_DEFS")

android_library(
fb_core_android_library(
name = "soloader",
srcs = glob(
["*.java"],
exclude = ["MergedSoMapping.java"],
),
proguard_config = "soloader.pro",
provided_deps = [
"//deps:jsr-305",
],
required_for_source_only_abi = True,
tests = [
"//javatests/com/facebook/soloader:soloader",
Expand All @@ -20,9 +25,6 @@ android_library(
# has to run very early in the app startup process.
# Definitely do *not* depend on guava.
],
provided_deps = [
"//deps:jsr-305",
],
)

fb_java_library(
Expand Down
6 changes: 1 addition & 5 deletions oss_defs/SOLOADER_DEFS
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def _deps_decorator(original_rule):
android_library = _deps_decorator(android_library)
android_aar = _deps_decorator(android_aar)
fb_java_library = _deps_decorator(java_library)
fb_core_android_library = android_library


DEPENDENCIES_INDEX = {}
Expand Down Expand Up @@ -79,8 +80,3 @@ def define_list_deps_target():
out='dependencies.json',
cmd="""echo '{}' > $OUT""".format(json_deps)
)


def fb_java_library(**kwargs):
"""Delegates to a native java_library rule."""
java_library(**kwargs)

0 comments on commit 60131ea

Please sign in to comment.