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

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

Merge "Dist android-non-updatable.jar for sdk" am: e93771bf am: 9ed545c4... 

Merge "Dist android-non-updatable.jar for sdk" am: e93771bf am: 9ed545c4 am: 27fe7fa7 am: d7440a1c

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

Change-Id: Id0ca05af00ec7322e1cb4afa64100f1e5393a883
parents 4e1a0f07 d7440a1c

StubLibraries.bp

+17 −0
Original line number Diff line number Diff line
@@ -322,6 +322,11 @@ java_defaults { 
    system_modules: "none",

    java_version: "1.8",

    compile_dex: true,

    dist: {

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

        tag: ".jar",

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

    }

}



java_library_static {
@@ -329,6 +334,9 @@ java_library_static { 
    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [":api-stubs-docs-non-updatable"],

    libs: modules_public_stubs,

    dist: {

        dir: "apistubs/android/public",

    },

}



java_library_static {
@@ -336,6 +344,9 @@ java_library_static { 
    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [ ":system-api-stubs-docs-non-updatable" ],

    libs: modules_system_stubs,

    dist: {

        dir: "apistubs/android/system",

    },

}



java_library_static {
@@ -347,6 +358,9 @@ java_library_static { 
        // NOTE: The below can be removed once the prebuilt stub contains IKE.

        "sdk_system_current_android.net.ipsec.ike",

    ],

    dist: {

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

    },

}



java_library_static {
@@ -354,6 +368,9 @@ java_library_static { 
    defaults: ["android-non-updatable_defaults_stubs_current"],

    srcs: [":test-api-stubs-docs-non-updatable"],

    libs: modules_system_stubs,

    dist: {

        dir: "apistubs/android/test",

    },

}



java_defaults {