From 64b7d402508d3e605fab02c816e3cbe2c2bc6ba6 Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Mon, 4 Nov 2019 10:04:50 +0000
Subject: [PATCH] Stop merging in annotations from ojluni-annotated-sdk-stubs

The annotations are already merged into the stubs that are exported
from libcore so this is unnecessary.

Bug: 142113521
Test: m checkbuild
      test this change does not change offline-sdk-docs
Change-Id: Icb0b61f80c91f96eaa22a7f1b92ffdf1825636c8
---
 Android.bp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index b546430686b52..284e7015c1158 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1020,7 +1020,6 @@ stubs_defaults {
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-sdk-stubs",
     ],
 }
 
@@ -1077,7 +1076,6 @@ stubs_defaults {
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-sdk-stubs",
     ],
     api_levels_annotations_enabled: true,
     api_levels_annotations_dirs: [
@@ -1412,7 +1410,6 @@ droidstubs {
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-sdk-stubs",
     ],
     args: " --show-annotation android.annotation.SystemApi",
 }