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

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

Merge "Rename module dist files" into rvc-dev am: 7e094973 

Change-Id: If24bfcc6dbe243d61863a5561b01f44bdadb439e
parents 3423fb08 7e094973

apex/media/framework/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ stubs_defaults { 
        // TODO(b/135922046) remove this

        include_dirs: ["frameworks/base/core/java"],

    },

    dist: { dest: "framework-media.txt" },

}



droidstubs {
@@ -130,18 +131,21 @@ java_library { 
    name: "framework-media-stubs-publicapi",

    srcs: [":framework-media-stubs-srcs-publicapi"],

    defaults: ["framework-module-stubs-lib-defaults-publicapi"],

    dist: { dest: "framework-media.jar" },

}



java_library {

    name: "framework-media-stubs-systemapi",

    srcs: [":framework-media-stubs-srcs-systemapi"],

    defaults: ["framework-module-stubs-lib-defaults-systemapi"],

    dist: { dest: "framework-media.jar" },

}



java_library {

    name: "framework-media-stubs-module_libs_api",

    srcs: [":framework-media-stubs-srcs-module_libs_api"],

    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],

    dist: { dest: "framework-media.jar" },

}



java_library {

apex/permission/framework/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ stubs_defaults { 
    name: "framework-permission-stubs-defaults",

    srcs: [ ":framework-permission-sources" ],

    libs: [ "framework-annotations-lib" ],

    dist: { dest: "framework-permission.txt" },

}



droidstubs {
@@ -84,16 +85,19 @@ java_library { 
    name: "framework-permission-stubs-publicapi",

    srcs: [ ":framework-permission-stubs-srcs-publicapi" ],

    defaults: ["framework-module-stubs-lib-defaults-publicapi"],

    dist: { dest: "framework-permission.jar" },

}



java_library {

    name: "framework-permission-stubs-systemapi",

    srcs: [ ":framework-permission-stubs-srcs-systemapi" ],

    defaults: ["framework-module-stubs-lib-defaults-systemapi"],

    dist: { dest: "framework-permission.jar" },

}



java_library {

    name: "framework-permission-stubs-module_libs_api",

    srcs: [ ":framework-permission-stubs-srcs-module_libs_api" ],

    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],

    dist: { dest: "framework-permission.jar" },

}

apex/permission/service/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ droidstubs { 
    name: "service-permission-stubs-srcs",

    srcs: [ ":service-permission-sources" ],

    defaults: ["service-module-stubs-srcs-defaults"],

    visibility: ["//visibility:private"]

    visibility: ["//visibility:private"],

    dist: { dest: "service-permission.txt" },

}



java_library {

    name: "service-permission-stubs",

    srcs: [":service-permission-stubs-srcs"],

    defaults: ["service-module-stubs-defaults"],

    visibility: ["//frameworks/base/services/core"]

    visibility: ["//frameworks/base/services/core"],

    dist: { dest: "service-permission.jar" },

}

apex/sdkextensions/framework/Android.bp

+11 −7
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ stubs_defaults { 
    name: "framework-sdkextensions-stubs-defaults",

    srcs: [ ":framework-sdkextensions-sources" ],

    libs: [ "framework-annotations-lib" ],

    dist: { dest: "framework-sdkextensions.txt" },

}



droidstubs {
@@ -55,7 +56,7 @@ droidstubs { 
    defaults: [

        "framework-module-stubs-defaults-publicapi",

        "framework-sdkextensions-stubs-defaults",

    ]

    ],

}



droidstubs {
@@ -63,7 +64,7 @@ droidstubs { 
    defaults: [

        "framework-module-stubs-defaults-systemapi",

        "framework-sdkextensions-stubs-defaults",

    ]

    ],

}



droidstubs {
@@ -71,7 +72,7 @@ droidstubs { 
    defaults: [

        "framework-module-api-defaults-module_libs_api",

        "framework-sdkextensions-stubs-defaults",

    ]

    ],

}



droidstubs {
@@ -79,7 +80,7 @@ droidstubs { 
    defaults: [

        "framework-module-stubs-defaults-module_libs_api",

        "framework-sdkextensions-stubs-defaults",

    ]

    ],

}



java_library {
@@ -89,7 +90,8 @@ java_library { 
    visibility: [

        "//frameworks/base", // Framework

        "//frameworks/base/apex/sdkextensions", // sdkextensions SDK

    ]

    ],

    dist: { dest: "framework-sdkextensions.jar" },

}



java_library {
@@ -99,7 +101,8 @@ java_library { 
    visibility: [

        "//frameworks/base", // Framework

        "//frameworks/base/apex/sdkextensions", // sdkextensions SDK

    ]

    ],

    dist: { dest: "framework-sdkextensions.jar" },

}



java_library {
@@ -109,5 +112,6 @@ java_library { 
    visibility: [

        "//frameworks/base", // Framework

        "//frameworks/base/apex/sdkextensions", // sdkextensions SDK

    ]

    ],

    dist: { dest: "framework-sdkextensions.jar" },

}

apex/statsd/framework/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ stubs_defaults { 
        "framework-annotations-lib",

    ],

    sdk_version: "system_current",

    dist: { dest: "framework-statsd.txt" },

}



droidstubs {
@@ -100,7 +101,6 @@ droidstubs { 
        "framework-module-stubs-defaults-systemapi",

        "framework-statsd-stubs-srcs-defaults",

    ],



}



droidstubs {
@@ -127,6 +127,7 @@ java_library { 
        "//frameworks/base", // Framework

        "//frameworks/base/apex/statsd", // statsd apex

    ],

    dist: { dest: "framework-statsd.jar" },

}



java_library {
@@ -137,6 +138,7 @@ java_library { 
        "//frameworks/base", // Framework

        "//frameworks/base/apex/statsd", // statsd apex

    ],

    dist: { dest: "framework-statsd.jar" },

}



java_library {
@@ -149,6 +151,7 @@ java_library { 
        "//frameworks/opt/net/wifi/service", // wifi service

        "//packages/providers/MediaProvider", // MediaProvider apk

    ],

    dist: { dest: "framework-statsd.jar" },

}



android_test {