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

Commit e8d6edc6 authored by Jared Duke's avatar Jared Duke
Browse files

Restrict use of framework-annotations 

This filegroup target should only be used when the raw srcs are needed.
Module targets can use `framework-annotations-lib` as a libs reference,
if necessary. Otherwise, the annotations are bundled directly with the
framework.

This refactor is in anticipation of bundling keep rules with the
framework-annotations-lib target, instead of defining global keep rules.

Bug: 275175207
Test: m
Flag: EXEMPT refactor
Change-Id: Id3d224ae725981151cdfe3d877d4ca152285842c
parent 35bb4587

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: [