Merge "Unbundle i18n API from android-non-updatable"
This commit is contained in:
@ -67,7 +67,7 @@ stubs_defaults {
|
||||
":opt-net-voip-srcs",
|
||||
":art.module.public.api{.public.stubs.source}",
|
||||
":conscrypt.module.public.api{.public.stubs.source}",
|
||||
":android_icu4j_public_api_files",
|
||||
":i18n.module.public.api{.public.stubs.source}",
|
||||
"test-mock/src/**/*.java",
|
||||
"test-runner/src/**/*.java",
|
||||
],
|
||||
|
@ -48,7 +48,6 @@ stubs_defaults {
|
||||
":opt-telephony-srcs",
|
||||
":opt-net-voip-srcs",
|
||||
":art.module.public.api{.public.stubs.source}",
|
||||
":android_icu4j_public_api_files",
|
||||
"**/package.html",
|
||||
],
|
||||
sdk_version: "core_platform",
|
||||
@ -246,6 +245,7 @@ java_library_static {
|
||||
"framework-statsd.stubs",
|
||||
"framework-tethering.stubs",
|
||||
"framework-wifi.stubs",
|
||||
"i18n.module.public.api.stubs",
|
||||
"private-stub-annotations-jar",
|
||||
],
|
||||
defaults: ["android_defaults_stubs_current"],
|
||||
@ -263,6 +263,7 @@ java_library_static {
|
||||
"framework-statsd.stubs.system",
|
||||
"framework-tethering.stubs.system",
|
||||
"framework-wifi.stubs.system",
|
||||
"i18n.module.public.api.stubs",
|
||||
"private-stub-annotations-jar",
|
||||
],
|
||||
defaults: [
|
||||
@ -296,6 +297,7 @@ java_library_static {
|
||||
"framework-statsd.stubs.system",
|
||||
"framework-tethering.stubs.system",
|
||||
"framework-wifi.stubs.system",
|
||||
"i18n.module.public.api.stubs",
|
||||
"private-stub-annotations-jar",
|
||||
],
|
||||
defaults: [
|
||||
|
@ -36,6 +36,7 @@ genrule {
|
||||
":framework-statsd{.public.api.txt}",
|
||||
":framework-tethering{.public.api.txt}",
|
||||
":framework-wifi{.public.api.txt}",
|
||||
":i18n.module.public.api{.public.api.txt}",
|
||||
":non-updatable-current.txt",
|
||||
],
|
||||
out: ["current.txt"],
|
||||
@ -48,7 +49,10 @@ genrule {
|
||||
dest: "current.txt",
|
||||
},
|
||||
{
|
||||
targets: ["sdk", "win_sdk"],
|
||||
targets: [
|
||||
"sdk",
|
||||
"win_sdk",
|
||||
],
|
||||
dir: "apistubs/android/public/api",
|
||||
dest: "android.txt",
|
||||
},
|
||||
@ -68,6 +72,7 @@ genrule {
|
||||
":framework-statsd{.public.stubs.source}",
|
||||
":framework-tethering{.public.stubs.source}",
|
||||
":framework-wifi{.public.stubs.source}",
|
||||
":i18n.module.public.api{.public.stubs.source}",
|
||||
],
|
||||
out: ["current.srcjar"],
|
||||
tools: ["merge_zips"],
|
||||
@ -86,6 +91,7 @@ genrule {
|
||||
":framework-statsd{.public.removed-api.txt}",
|
||||
":framework-tethering{.public.removed-api.txt}",
|
||||
":framework-wifi{.public.removed-api.txt}",
|
||||
":i18n.module.public.api{.public.removed-api.txt}",
|
||||
":non-updatable-removed.txt",
|
||||
],
|
||||
out: ["removed.txt"],
|
||||
@ -122,7 +128,10 @@ genrule {
|
||||
dest: "system-current.txt",
|
||||
},
|
||||
{
|
||||
targets: ["sdk", "win_sdk"],
|
||||
targets: [
|
||||
"sdk",
|
||||
"win_sdk",
|
||||
],
|
||||
dir: "apistubs/android/system/api",
|
||||
dest: "android.txt",
|
||||
},
|
||||
@ -177,7 +186,10 @@ genrule {
|
||||
dest: "module-lib-current.txt",
|
||||
},
|
||||
{
|
||||
targets: ["sdk", "win_sdk"],
|
||||
targets: [
|
||||
"sdk",
|
||||
"win_sdk",
|
||||
],
|
||||
dir: "apistubs/android/module-lib/api",
|
||||
dest: "android.txt",
|
||||
},
|
||||
|
4806
core/api/current.txt
4806
core/api/current.txt
File diff suppressed because it is too large
Load Diff
@ -221,14 +221,6 @@ package android.hardware {
|
||||
|
||||
}
|
||||
|
||||
package android.icu.util {
|
||||
|
||||
public class JapaneseCalendar extends android.icu.util.GregorianCalendar {
|
||||
field @Deprecated public static final int CURRENT_ERA;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
package android.location {
|
||||
|
||||
public class Location implements android.os.Parcelable {
|
||||
|
Reference in New Issue
Block a user