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

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

Merge "Convert disting of api txt from mk to bp" into rvc-dev am: 9cc8c2e6 am: 6a5f8639 

Change-Id: Ia9e38f79e8a803303fd2d4be7cf02cdbd8cc7153
parents 55365cd9 6a5f8639

Android.mk

+0 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ INTERNAL_SDK_SOURCE_DIRS := $(addprefix $(LOCAL_PATH)/,$(dirs_to_document)) 
$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE))

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))

$(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

+20 −0
Original line number Diff line number Diff line
@@ -115,6 +115,11 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/public/api",

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -156,6 +161,11 @@ droidstubs { 
            baseline_file: "api/system-lint-baseline.txt",

        },

    },

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/system/api",

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -179,6 +189,11 @@ droidstubs { 
            baseline_file: "api/test-lint-baseline.txt",

        },

    },

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/test/api",

        dest: "android.txt",

    },

}



/////////////////////////////////////////////////////////////////////
@@ -214,6 +229,11 @@ droidstubs { 
            baseline_file: "api/module-lib-lint-baseline.txt",

        },

    },

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/module-lib/api",

        dest: "android.txt",

    },

}

services/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

        targets: ["sdk", "win_sdk"],

        dir: "apistubs/android/system-server/api",

        dest: "android.txt",

    },

}



java_library {