From c8cbb3667332813b7095287c6237c0f0dd0ef906 Mon Sep 17 00:00:00 2001
From: Pete Gillin <peteg@google.com>
Date: Tue, 31 Jul 2018 13:33:03 +0100
Subject: Add libcore/ojluni/annotations as a source for metalava.

This adds the new annotations (in Java stub format) to the list that
metalava will merge when building stubs.

Bug: 111639530
Test: `make metalava-api-stubs-docs`
Change-Id: I5e73d1276f0602bd14a41f7a64659b1a7b1347cf
---
 Android.bp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.bp b/Android.bp
index 2b3b750f9475..f118375eb78e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1421,6 +1421,7 @@ doc_defaults {
     metalava_previous_api: ":public-api-for-metalava-annotations",
     metalava_merge_annotations_dirs: [
         "metalava-manual",
+        "ojluni-annotated-stubs",
     ],
 }
 
-- 
cgit v1.2.3-59-g8ed1b