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

Commit 41b6aba2 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Automerger Merge Worker
Browse files

Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main... 

Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb6 am: 0275f893 am: 48567b75 am: f50a02c3

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



Change-Id: I7180de66726e9d35d778ad6af3d1cccd50efb617
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a58869b7 f50a02c3

AconfigFlags.bp

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

// limitations under the License.



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

aconfig_srcjars = [

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

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

    ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",

    ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",

    ":com.android.hardware.input-aconfig-java{.generated_srcjars}",

    ":com.android.text.flags-aconfig-java{.generated_srcjars}",

    ],

]



filegroup {

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

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

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

    srcs: aconfig_srcjars,

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

}

api/StubLibraries.bp

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ 


droidstubs {

    name: "api-stubs-docs-non-updatable",

    srcs: [

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

    ],

    defaults: [

        "android-non-updatable-stubs-defaults",

        "module-classpath-stubs-defaults",