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

Commit 24c79cdb authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6 am: 3322b280 am: f358ccec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
parents 9b1405c6 f358ccec
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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",
    ],
+3 −1
Original line number Diff line number Diff line
@@ -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",
@@ -251,6 +250,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"],
@@ -270,6 +270,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: [
@@ -305,6 +306,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: [
+15 −3
Original line number Diff line number Diff line
@@ -38,6 +38,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"],
@@ -50,7 +51,10 @@ genrule {
            dest: "current.txt",
        },
        {
            targets: ["sdk", "win_sdk"],
            targets: [
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/public/api",
            dest: "android.txt",
        },
@@ -72,6 +76,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"],
@@ -92,6 +97,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"],
@@ -130,7 +136,10 @@ genrule {
            dest: "system-current.txt",
        },
        {
            targets: ["sdk", "win_sdk"],
            targets: [
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/system/api",
            dest: "android.txt",
        },
@@ -189,7 +198,10 @@ genrule {
            dest: "module-lib-current.txt",
        },
        {
            targets: ["sdk", "win_sdk"],
            targets: [
                "sdk",
                "win_sdk",
            ],
            dir: "apistubs/android/module-lib/api",
            dest: "android.txt",
        },
+0 −4806

File changed.

Preview size limit exceeded, changes collapsed.

+0 −8
Original line number Diff line number Diff line
@@ -213,14 +213,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 {