commit 50df226b69c76f7ed0edd5e31b0dd8e639162150
author Pete Gillin <peteg@google.com> Tue Sep 18 11:20:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 18 11:20:16 2018 -0700
tree d6205008be820b47636adb6e4243746171cdfe7d
parent 996c96d1c97bb8fdb7748de28b00531bd3974502
parent 59fa25a5f59f97cfc001bf3d1492d37f7897eac5

Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03 am: cddbd39be7
am: 59fa25a5f5

Change-Id: Idd9e6ee25e60b9882f3992cf1b19f929eca37621

Android.bp

diff --git a/Android.bp b/Android.bp
index ca1c614..d070fa4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1166,7 +1166,7 @@
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-stubs",
+        "ojluni-annotated-sdk-stubs",
     ],
 }
 
@@ -1228,7 +1228,7 @@
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-stubs",
+        "ojluni-annotated-sdk-stubs",
     ],
 }
 
@@ -1499,7 +1499,7 @@
     previous_api: ":last-released-public-api",
     merge_annotations_dirs: [
         "metalava-manual",
-        "ojluni-annotated-stubs",
+        "ojluni-annotated-sdk-stubs",
     ],
     args: " --show-annotation android.annotation.SystemApi",
 }