Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "java_sdk_library_module_lib" am: 53655f77a6

Browse Source 
Change-Id: If595eb2097debe20e19d7a3fb06de95429c0a60d
This commit is contained in:
Paul Duffin
2020-05-15 16:37:14 +00:00
committed by Automerger Merge Worker
parent 7b26084840 53655f77a6
commit add87675e1
2 changed files with 9 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/sdkextensions/Android.bp
View File

@@ -39,7 +39,7 @@ apex_defaults {
sdk {
name: "sdkextensions-sdk",
java_header_libs: [ "framework-sdkextensions-stubs-systemapi" ],
java_sdk_libs: [ "framework-sdkextensions" ],
}
apex_key {

84
apex/sdkextensions/framework/Android.bp
View File

@@ -25,14 +25,18 @@ filegroup {
visibility: [ "//frameworks/base" ] // For the "global" stubs.
}
java_library {
java_sdk_library {
name: "framework-sdkextensions",
srcs: [ ":framework-sdkextensions-sources" ],
sdk_version: "system_current",
libs: [ "framework-annotations-lib" ],
defaults: ["framework-module-defaults"],
// TODO(b/155480189) - Remove naming_scheme once references have been resolved.
// Temporary java_sdk_library component naming scheme to use to ease the transition from separate
// modules to java_sdk_library.
naming_scheme: "framework-modules",
permitted_packages: [ "android.os.ext" ],
installable: true,
plugins: ["java_api_finder"],
visibility: [
"//frameworks/base/apex/sdkextensions",
"//frameworks/base/apex/sdkextensions/testing",
@@ -43,75 +47,3 @@ java_library {
"test_com.android.sdkext",
],
}
stubs_defaults {
name: "framework-sdkextensions-stubs-defaults",
srcs: [ ":framework-sdkextensions-sources" ],
libs: [ "framework-annotations-lib" ],
dist: { dest: "framework-sdkextensions.txt" },
}
droidstubs {
name: "framework-sdkextensions-stubs-srcs-publicapi",
defaults: [
"framework-module-stubs-defaults-publicapi",
"framework-sdkextensions-stubs-defaults",
],
}
droidstubs {
name: "framework-sdkextensions-stubs-srcs-systemapi",
defaults: [
"framework-module-stubs-defaults-systemapi",
"framework-sdkextensions-stubs-defaults",
],
}
droidstubs {
name: "framework-sdkextensions-api-module_libs_api",
defaults: [
"framework-module-api-defaults-module_libs_api",
"framework-sdkextensions-stubs-defaults",
],
}
droidstubs {
name: "framework-sdkextensions-stubs-srcs-module_libs_api",
defaults: [
"framework-module-stubs-defaults-module_libs_api",
"framework-sdkextensions-stubs-defaults",
],
}
java_library {
name: "framework-sdkextensions-stubs-publicapi",
srcs: [":framework-sdkextensions-stubs-srcs-publicapi"],
defaults: ["framework-module-stubs-lib-defaults-publicapi"],
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
],
dist: { dest: "framework-sdkextensions.jar" },
}
java_library {
name: "framework-sdkextensions-stubs-systemapi",
srcs: [":framework-sdkextensions-stubs-srcs-systemapi"],
defaults: ["framework-module-stubs-lib-defaults-systemapi"],
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
],
dist: { dest: "framework-sdkextensions.jar" },
}
java_library {
name: "framework-sdkextensions-stubs-module_libs_api",
srcs: [":framework-sdkextensions-stubs-srcs-module_libs_api"],
defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
visibility: [
"//frameworks/base", // Framework
"//frameworks/base/apex/sdkextensions", // sdkextensions SDK
],
dist: { dest: "framework-sdkextensions.jar" },
}