Merge "java_api_contribution public, module lib module definition for framework base" am: a7916faa4c am: abc2e450e1 am: 0dab4e4795

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2359959

Change-Id: I8fb608d328b10603f263ae10b1f6f498171dc221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

@@ -694,3 +694,12 @@ build = [
     "ProtoLibraries.bp",
     "TestProtoLibraries.bp",
 ]
+
+java_api_contribution {
+    name: "api-stubs-docs-non-updatable-public-stubs",
+    api_surface: "public",
+    api_file: "core/api/current.txt",
+    visibility: [
+        "//build/orchestrator/apis",
+    ],
+}

StubLibraries.bp

@@ -598,3 +598,12 @@ java_library {
     ],
     visibility: ["//visibility:public"],
 }
+
+java_api_contribution {
+    name: "frameworks-base-core-api-module-lib-stubs",
+    api_surface: "module-lib",
+    api_file: "core/api/module-lib-current.txt",
+    visibility: [
+        "//build/orchestrator/apis",
+    ],
+}

libs/hwui/Android.bp

@@ -215,6 +215,15 @@ filegroup {
     path: "apex/java",
 }
 
+java_api_contribution {
+    name: "framework-graphics-public-stubs",
+    api_surface: "public",
+    api_file: "api/current.txt",
+    visibility: [
+        "//build/orchestrator/apis",
+    ],
+}
+
 // ------------------------
 // APEX
 // ------------------------