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

Commit b07dd5f8 authored by Siim Sammul's avatar Siim Sammul Committed by Automerger Merge Worker
Browse files

Merge "Set up platform flags to use for enabling proto tombstone" into main am: a779b380 

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



Change-Id: I53423986a5611978a4bcf5a5ee04eb179d940746
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 899efc87 a779b380

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ java_library_static { 
        "com.android.server.utils_aconfig-java",

        "service-jobscheduler-deviceidle.flags-aconfig-java",

        "net_flags_lib",

        "core_os_flags_lib",

    ],

    javac_shard_size: 50,

    javacflags: [

services/core/java/com/android/server/os/Android.bp

0 → 100644
+12 −0
Original line number Diff line number Diff line 
aconfig_declarations {

    name: "core_os_flags",

    package: "com.android.server.os",

    srcs: [

        "*.aconfig",

    ],

}



java_aconfig_library {

    name: "core_os_flags_lib",

    aconfig_declarations: "core_os_flags",

}

services/core/java/com/android/server/os/core_os_flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "com.android.server.os"



flag {

    name: "proto_tombstone"

    namespace: "proto_tombstone_ns"

    description: "Use proto tombstones as source of truth for adding to dropbox"

    bug: "323857385"

}