Skip to content

Commit

Permalink
Fix annotations artifact (#61)
Browse files Browse the repository at this point in the history
Summary:
These appear to be intended to be a plain java library but were still defined as an aar, which then had a conflicting manifest package name as well.

Resolves #58
Pull Request resolved: #61

Test Plan: {F234018852}

Reviewed By: oprisnik

Differential Revision: D20940655

Pulled By: passy

fbshipit-source-id: 0b02297af92a16913c77302c484e15302095240d
  • Loading branch information
ZacSweers authored and facebook-github-bot committed Apr 15, 2020
1 parent 6dce279 commit 343e82f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .buckconfig
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
[alias]
[java]
src_roots = /java/
[project]
# IntelliJ requires that every Android module have an
# AndroidManifest.xml file associated with it. In practice,
# most of this is unnecessary boilerplate, so we create one
# "shared" AndroidManifest.xml file that can be used as a default.
default_android_manifest = //res/AndroidManifest.xml
[android]
target = android-26
build_tools_version = 27.0.3
Expand Down
8 changes: 3 additions & 5 deletions BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ export_file(
out = "nativeloader.jar",
)

android_aar(
export_file(
name = "annotation",
manifest_skeleton = "AndroidManifestSkeleton.xml",
deps = [
"//java/com/facebook/soloader:annotation",
],
src = "//java/com/facebook/soloader:annotation",
out = "annotation.jar",
)

0 comments on commit 343e82f

Please sign in to comment.