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

Commit d9a3fee2 authored by Anton Hansson's avatar Anton Hansson
Browse files

Convert disting of api txt from mk to bp 

droidstubs dist now dists the api file, so convert these manual
mk rules into bp dist instead.

Bug: 149293194
Test: m dist sdk && find out/dist/apistubs -name /android\.txt
Change-Id: I96052b427dc01a6d24b040ad0006129d4d1e48fb
parent 8c6b17b1

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

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

    jdiff_enabled: true,

}
@@ -160,6 +165,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,

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

        },

    },

    dist: {

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

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

        dest: "android.txt",

    },

}



/////////////////////////////////////////////////////////////////////
@@ -218,6 +233,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 {