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

Commit f155a724 authored by Victor Hsieh's avatar Victor Hsieh
Browse files

Move deprecate_fsv_sig flag to another package 

The previous flag isn't picked up by the build system and is missing in
/system/etc/aconfig_flags.textproto. To get included, it currently
requires an explicit dependency, e.g. from services.jar.

To avoid an ad-hoc workaround in an upper level Android.bp for this
flag, switch the feature flag to another package which is already in
frameworks/base/AconfigFlags.bp.

Bug: 277916185
Test: saw the flag in /system/etc/aconfig_flags.textproto
Test: use the flag
Change-Id: I6e9ffbd1356703fcba9972ba9dd1cb9886d52d84
parent 322ea4c9

core/java/android/security/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -13,3 +13,10 @@ flag { 
    description: "Fix bugs in behavior of UnlockedDeviceRequired keystore keys"

    bug: "296464083"

}



flag {

    name: "deprecate_fsv_sig"

    namespace: "hardware_backed_security"

    description: "Feature flag for deprecating .fsv_sig"

    bug: "277916185"

}

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

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
aconfig_declarations {

    name: "com.android.server.security.flags-aconfig",

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

    srcs: ["*.aconfig"],

}



java_aconfig_library {

    name: "com.android.server.security.flags-aconfig-java",

    aconfig_declarations: "com.android.server.security.flags-aconfig",

}



java_aconfig_library {

    name: "com.android.server.security.flags-aconfig-java-host",

    aconfig_declarations: "com.android.server.security.flags-aconfig",

    host_supported: true,

    test: true,

}

services/core/java/com/android/server/security/flags.aconfig

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



flag {

    name: "deprecate_fsv_sig"

    namespace: "hardware_backed_security"

    description: "Feature flag for deprecating .fsv_sig"

    bug: "277916185"

}