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

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

Merge "Remove references to win_sdk" am: dddbdc3b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933148

Change-Id: I2da31e6e4b39e130b29f6900ac4bc772684e651c
parents 2863db4a dddbdc3b

StubLibraries.bp

+13 −52
Original line number Diff line number Diff line
@@ -59,19 +59,13 @@ droidstubs { 
    },

    dists: [

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -115,19 +109,13 @@ droidstubs { 
    },

    dists: [

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -151,37 +139,25 @@ droidstubs { 
    },

    dists: [

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "removed.txt",

            tag: ".removed-api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -210,19 +186,13 @@ droidstubs { 
    },

    dists: [

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",
@@ -282,10 +252,7 @@ java_defaults { 
    java_version: "1.8",

    compile_dex: true,

    dist: {

        targets: [

            "sdk",

            "win_sdk",

        ],

        targets: ["sdk"],

        tag: ".jar",

        dest: "android-non-updatable.jar",

    },
@@ -341,10 +308,7 @@ java_library { 
java_defaults {

    name: "android_stubs_dists_default",

    dist: {

        targets: [

            "sdk",

            "win_sdk",

        ],

        targets: ["sdk"],

        tag: ".jar",

        dest: "android.jar",

    },
@@ -376,10 +340,7 @@ java_library { 
    dists: [

        {

            // Legacy dist path

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

            tag: ".jar",

            dest: "android_system.jar",

        },

api/Android.bp

+9 −36
Original line number Diff line number Diff line
@@ -120,10 +120,7 @@ genrule { 
            dest: "current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android.txt",

        },
@@ -205,10 +202,7 @@ genrule { 
            dest: "removed.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "removed.txt",

        },
@@ -244,10 +238,7 @@ genrule { 
            dest: "system-current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android.txt",

        },
@@ -302,10 +293,7 @@ genrule { 
            dest: "system-removed.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "removed.txt",

        },
@@ -342,10 +330,7 @@ genrule { 
            dest: "module-lib-current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android.txt",

        },
@@ -402,10 +387,7 @@ genrule { 
            dest: "module-lib-removed.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "removed.txt",

        },
@@ -446,10 +428,7 @@ genrule { 
            dest: "system-server-current.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android.txt",

        },
@@ -473,10 +452,7 @@ genrule { 
            dest: "system-server-removed.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "removed.txt",

        },
@@ -514,9 +490,6 @@ genrule { 
    tools: ["api_versions_trimmer"],

    cmd: "$(location api_versions_trimmer) $(out) $(in)",

    dist: {

        targets: [

            "sdk",

            "win_sdk",

        ],

        targets: ["sdk"],

    },

}

services/Android.bp

+2 −8
Original line number Diff line number Diff line
@@ -221,19 +221,13 @@ droidstubs { 
    },

    dists: [

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable.txt",

            tag: ".api.txt",

        },

        {

            targets: [

                "sdk",

                "win_sdk",

            ],

            targets: ["sdk"],

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

            dest: "android-non-updatable-removed.txt",

            tag: ".removed-api.txt",

test-legacy/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
include $(BUILD_STATIC_JAVA_LIBRARY)



# Archive a copy of the classes.jar in SDK build.

$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)

$(call dist-for-goals,sdk,$(full_classes_jar):android.test.legacy.jar)



endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true