commit fb7218e7ced6dae1654ffc723835bda6e3696ac7
author Colin Cross <ccross@android.com> Fri Oct 27 17:50:42 2017 +0000
committer Colin Cross <ccross@android.com> Mon Oct 30 14:08:49 2017 -0700
tree fed923d4239bb7e2924c645d15f9dd1f12016915
parent 6f02cff303d67012a1cabbfe7ddadd85d359152c

Revert "Revert "Add makefile targets for ojluni jaif-annotated source files.""

This reverts commit 554d65461915e1f9d2197a13d4ef39fa9964c809.

This reapplies I9571a7841cbcc2790891352e0efc69327484736b with additional fixes for absolute OUT_DIR.

Bug: 64930165
Bug: 68375156
Test: m checkbuild
Test: m docs
Change-Id: Iabb6689559752932f7e9a9bfb3c6d1077e844b1f

JavaLibrary.bp

diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 5d13615..22694ef 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -35,6 +35,7 @@
 build = [
     "openjdk_java_files.bp",
     "non_openjdk_java_files.bp",
+    "annotated_java_files.bp",
 ]
 
 // The Java files and their associated resources.