diff options
| author | Anton Hansson <hansson@google.com> | 2020-03-19 15:09:44 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-03-20 15:22:20 +0000 |
| commit | 9a01e55cb6f084e735bea16a7d791b633522d5f1 (patch) | |
| tree | 87b376bf9efd76c9b6f5f8f418560983bf255e2a | |
| parent | bde7d4f2e4c568476d555b8a6a665db221012c9a (diff) | |
Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.
Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Ia1064e50e987433e5e308527c6770ba2d3e8bde3
Merged-In: Ia1064e50e987433e5e308527c6770ba2d3e8bde3
(cherry picked from commit 7b0414beb77aaf67124c3ef7f2a55a898772bd1d)
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | StubLibraries.bp | 1 | ||||
| -rw-r--r-- | services/Android.bp | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 09f2c40e7202..aea0c951052f 100644 --- a/Android.mk +++ b/Android.mk @@ -42,6 +42,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE)) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE):apistubs/android/public/api/android.txt) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE):apistubs/android/system/api/android.txt) $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE):apistubs/android/test/api/android.txt) +$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_MODULE_LIB_API_FILE):apistubs/android/module-lib/api/android.txt) +$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_SERVER_API_FILE):apistubs/android/system-server/api/android.txt) # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip. # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to diff --git a/StubLibraries.bp b/StubLibraries.bp index e8aa3936d889..e81fc599a1be 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -186,6 +186,7 @@ droidstubs { droidstubs { name: "module-lib-api", defaults: ["metalava-full-api-stubs-default"], + api_tag_name: "MODULE_LIB", arg_files: ["core/res/AndroidManifest.xml"], args: metalava_framework_docs_args + module_libs, check_api: { diff --git a/services/Android.bp b/services/Android.bp index 30dbbd411a79..1ab23955610b 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -110,6 +110,7 @@ droidstubs { name: "services-stubs.sources", srcs: [":services-sources"], installable: false, + api_tag_name: "SYSTEM_SERVER", args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" + " --hide-annotation android.annotation.Hide" + " --hide InternalClasses" + // com.android.* classes are okay in this interface |