commit 1a2b94064622d5c4333a065781b781868afa2d35
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 09 11:12:51 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 09 11:12:51 2019 +0000
tree 4e858df40b67f853a007ccbde5047f3b7a6b22fe
parent b3866aeee2291a64aaf845c8221d6da0bf1a3a2a
parent 64b7d402508d3e605fab02c816e3cbe2c2bc6ba6

Merge "Stop merging in annotations from ojluni-annotated-sdk-stubs"

Android.bp

diff --git a/Android.bp b/Android.bp
index b546430..284e701 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1020,7 +1020,6 @@
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-sdk-stubs",
     ],
 }
 
@@ -1077,7 +1076,6 @@
     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 @@
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-sdk-stubs",
     ],
     args: " --show-annotation android.annotation.SystemApi",
 }