Merge changes from topic "mvstub" am: ced0bbd1df am: 68e49ada80

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2578417 Change-Id: Ie314c615da1e713aeca33f71d97795320db1a619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 10:21:30 +00:00
parent 742ca033ce 68e49ada80
commit b47fe3b861
5 changed files with 6 additions and 2 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -612,8 +612,6 @@ stubs_defaults {
 }

 build = [
-    "StubLibraries.bp",
-    "ApiDocs.bp",
    "ProtoLibraries.bp",
    "TestProtoLibraries.bp",
 ]
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -252,3 +252,8 @@ java_genrule {
    out: ["api_fingerprint.txt"],
    cmd: "cat $(in) | md5sum | cut -d' ' -f1 > $(out)",
 }
+
+build = [
+    "ApiDocs.bp",
+    "StubLibraries.bp",
+]
--- a/api/ApiDocs.bp
+++ b/api/ApiDocs.bp
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
--- a/api/docs
+++ b/api/docs
@@ -0,0 +1 @@
+../docs