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

Commit 0792b12f authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "CurrentTimeMillisLong: Move to framework-annotations"

parents 658cd3cc 7751734b

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -688,6 +688,7 @@ filegroup { 
    srcs: [

        "core/java/android/annotation/CallbackExecutor.java",

        "core/java/android/annotation/CheckResult.java",

        "core/java/android/annotation/CurrentTimeMillisLong.java",

        "core/java/android/annotation/IntDef.java",

        "core/java/android/annotation/IntRange.java",

        "core/java/android/annotation/NonNull.java",
@@ -1127,7 +1128,6 @@ filegroup { 
    srcs: [

        ":framework-annotations",

        "core/java/android/annotation/BytesLong.java",

        "core/java/android/annotation/CurrentTimeMillisLong.java",

        "core/java/android/annotation/CurrentTimeSecondsLong.java",

        "core/java/android/annotation/DurationMillisLong.java",

    ],

wifi/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ java_library { 
        // TODO(b/146757305): should be unnecessary once

        // sdk_version="module_lib_current"

        "android_system_stubs_current",

        "framework_mediaprovider_annotation", // for android.annotation.CurrentTimeMillisLong

    ],

    srcs: [

        ":framework-wifi-updatable-sources",