From 2a829bb51e36c70ee5914da08b568f4055169536 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Thu, 1 Feb 2024 22:01:15 +0000 Subject: Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions This change modifies the sdk-annotations-*.zip definitions so that the modules depend on the exportable annotations.zip files instead of the everything annotations.zip files. This change also modifies the definition of the android_*_stubs_current_with_test_libs modules definitions to depend on the exportable stubs. Likewise, the droiddoc modules now depend on the exportable stubs. Test: m docs dist && inspect ninja file to verify that everything stubs are not exported Test: m sdk dist && inspect api-versions.xml file and verify that the disabled apis are not included Bug: 323261972 Change-Id: I015921f0d006bac29492be22b83043b39a8fe8eb --- api/Android.bp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'api/Android.bp') diff --git a/api/Android.bp b/api/Android.bp index 7fb427eb715a..113424f7817d 100644 --- a/api/Android.bp +++ b/api/Android.bp @@ -231,7 +231,7 @@ genrule { name: "sdk-annotations.zip", defaults: ["sdk-annotations-defaults"], srcs: [ - ":android-non-updatable-doc-stubs{.annotations.zip}", + ":android-non-updatable-doc-stubs{.exportable.annotations.zip}", ":all-modules-public-annotations", ], } @@ -240,7 +240,7 @@ genrule { name: "sdk-annotations-system.zip", defaults: ["sdk-annotations-defaults"], srcs: [ - ":android-non-updatable-doc-stubs-system{.annotations.zip}", + ":android-non-updatable-doc-stubs-system{.exportable.annotations.zip}", ":all-modules-system-annotations", ], } @@ -249,7 +249,7 @@ genrule { name: "sdk-annotations-module-lib.zip", defaults: ["sdk-annotations-defaults"], srcs: [ - ":android-non-updatable-doc-stubs-module-lib{.annotations.zip}", + ":android-non-updatable-doc-stubs-module-lib{.exportable.annotations.zip}", ":all-modules-module-lib-annotations", ], } @@ -258,7 +258,7 @@ genrule { name: "sdk-annotations-system-server.zip", defaults: ["sdk-annotations-defaults"], srcs: [ - ":android-non-updatable-doc-stubs-system-server{.annotations.zip}", + ":android-non-updatable-doc-stubs-system-server{.exportable.annotations.zip}", ":all-modules-system-server-annotations", ], } -- cgit v1.2.3-59-g8ed1b