diff options
| author | 2020-03-25 15:56:51 +0000 | |
|---|---|---|
| committer | 2020-03-25 15:56:51 +0000 | |
| commit | 33d6fda1e0108ca34848bc9a88e421d91f828e08 (patch) | |
| tree | 0255221b6a4cf328b2dbfb7d10f359160060f9d6 | |
| parent | 083066201e8fab5c971b881d1b0a486c83e13c51 (diff) | |
| parent | 9a01e55cb6f084e735bea16a7d791b633522d5f1 (diff) | |
Merge "Add module_lib and system-server artifacts to sdk dist"
| -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 9a52cf69ef3d..0931fd4b6a74 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -187,6 +187,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 |