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 551dc63 commit b7dd4ff
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
5 changes: 2 additions & 3 deletions BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_LAYOUT_HIERARCHY_COMMON_TARGET", "SCREENSHOT_TESTS_LAYOUT_HIERARCHY_LITHO_TARGET", "SCREENSHOT_TESTS_VISIBILITY", "fb_core_android_library")

load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_LAYOUT_HIERARCHY_COMMON_TARGET", "SCREENSHOT_TESTS_LAYOUT_HIERARCHY_LITHO_TARGET", "SCREENSHOT_TESTS_VISIBILITY")

android_library(
fb_core_android_library(
name = "screenshot",
exported_deps = [
SCREENSHOT_TESTS_CORE_TARGET,
Expand Down
4 changes: 4 additions & 0 deletions SCREENSHOT_TESTS_DEFS
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ SCREENSHOT_TESTS_LITHO_WIDGET_TARGET = dep('lib/litho:litho-widget')
SCREENSHOT_TESTS_JUNIT_TARGET = dep('lib/junit:junit')
SCREENSHOT_TESTS_DEXMAKER_TARGET = dep('lib/dexmaker:dexmaker')
SCREENSHOT_TESTS_DEXMAKER_DX_TARGET = dep('lib/dexmaker:dexmaker-dx')


def fb_core_android_library(**kwargs):
native.android_library(**kwargs)
5 changes: 2 additions & 3 deletions core/src/main/java/com/facebook/testing/screenshot/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_VISIBILITY", "fb_core_android_library")

load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_VISIBILITY")

android_library(
fb_core_android_library(
name = "screenshot",
srcs = glob(["**/*.java"]),
visibility = SCREENSHOT_TESTS_VISIBILITY,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_VISIBILITY", "fb_core_android_library")

load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_VISIBILITY")

android_library(
fb_core_android_library(
name = "common",
srcs = glob(["**/*.java"]),
visibility = SCREENSHOT_TESTS_VISIBILITY,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_LITHO_CORE_TARGET", "SCREENSHOT_TESTS_LITHO_WIDGET_TARGET", "SCREENSHOT_TESTS_VISIBILITY", "fb_core_android_library")

load("//:SCREENSHOT_TESTS_DEFS", "SCREENSHOT_TESTS_CORE_TARGET", "SCREENSHOT_TESTS_LITHO_CORE_TARGET", "SCREENSHOT_TESTS_LITHO_WIDGET_TARGET", "SCREENSHOT_TESTS_VISIBILITY")

android_library(
fb_core_android_library(
name = "litho",
srcs = glob(["**/*.java"]),
visibility = SCREENSHOT_TESTS_VISIBILITY,
Expand Down
5 changes: 3 additions & 2 deletions lib/litho/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load("//:SCREENSHOT_TESTS_DEFS", "fb_core_android_library")

android_library(
fb_core_android_library(
name = "litho-core",
exported_deps = [
":litho-core-prebuilt",
Expand All @@ -32,7 +33,7 @@ remote_file(
url = "mvn:com.facebook.litho:litho-core:aar:0.7.0",
)

android_library(
fb_core_android_library(
name = "litho-widget",
exported_deps = [
":litho-widget-prebuilt",
Expand Down

0 comments on commit b7dd4ff

Please sign in to comment.