Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04b1f5b4 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add module_lib and system-server artifacts to sdk dist" into rvc-dev... 

Merge "Add module_lib and system-server artifacts to sdk dist" into rvc-dev am: 043255c8 am: 5a6592f0 am: 5a4415f1

Change-Id: I39d592ccec37ce5d4727181d94aa02b2664ada5d
parents 901041dd 5a4415f1

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

StubLibraries.bp

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,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: {

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ droidstubs { 
    name: "services-stubs.sources",

    srcs: [":services-all-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