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

Commit 157d0c18 authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Expand @FlaggedApi(FLAG) constants in API signature files" 

This reverts commit 35eb10d9.

Reason for revert: Probable culprit for b/300626881

Change-Id: I5f1ca00ed83d4c41659bbdeb04c4ea296f08fa71
parent 35eb10d9

AconfigFlags.bp

+5 −12
Original line number Diff line number Diff line
@@ -12,8 +12,11 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



filegroup {

    name: "framework-minus-apex-aconfig-srcjars",

// Aconfig declarations and libraries for the core framework

java_defaults {

    name: "framework-minus-apex-aconfig-libraries",



    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: [

        ":android.app.usage.flags-aconfig-java{.generated_srcjars}",

        ":android.content.pm.flags-aconfig-java{.generated_srcjars}",
@@ -33,16 +36,6 @@ filegroup { 
        ":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",

        ":sdk_sandbox_flags_lib{.generated_srcjars}",

    ],

}



// Aconfig declarations and libraries for the core framework

java_defaults {

    name: "framework-minus-apex-aconfig-libraries",



    // Add java_aconfig_libraries to here to add them to the core framework

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    // Add aconfig-annotations-lib as a dependency for the optimization

    libs: ["aconfig-annotations-lib"],

}

api/StubLibraries.bp

+0 −3
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ droidstubs { 
        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",

    ],

    srcs: [

        ":framework-minus-apex-aconfig-srcjars",

    ],

    args: metalava_framework_docs_args + "--error UnflaggedApi ",

    check_api: {

        current: {

core/api/current.txt

+47 −47

File changed.

Preview size limit exceeded, changes collapsed.