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

Commit 019256c4 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Convert disting of api txt from mk to bp"

parents ec1cb149 ba367d3b

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
@@ -110,6 +110,11 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -151,6 +156,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,

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

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

}



/////////////////////////////////////////////////////////////////////
@@ -213,6 +228,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
@@ -133,6 +133,11 @@ droidstubs { 
            baseline_file: "api/lint-baseline.txt",

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

}



java_library {