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

Commit 99624608 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Restrict use of framework-annotations" into main

parents 315433ca e8d6edc6

Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -597,8 +597,6 @@ filegroup { 
filegroup {

filegroup {

    name: "framework-networkstack-shared-srcs",

    name: "framework-networkstack-shared-srcs",

    srcs: [

    srcs: [

        // TODO: remove these annotations as soon as we can use andoid.support.annotations.*

        ":framework-annotations",

        ":modules-utils-preconditions-srcs",

        ":modules-utils-preconditions-srcs",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/IndentingPrintWriter.java",

        "core/java/android/util/LocalLog.java",

        "core/java/android/util/LocalLog.java",

services/net/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ java_library_static { 
filegroup {

filegroup {

    name: "services-tethering-shared-srcs",

    name: "services-tethering-shared-srcs",

    srcs: [

    srcs: [

        ":framework-annotations",

        "java/android/net/util/NetworkConstants.java",

        "java/android/net/util/NetworkConstants.java",

    ],

    ],

    visibility: [

    visibility: [