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

Commit 04e741ad authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Automerger Merge Worker
Browse files

Bump KeyMint and Keystore version am: 7adb4d0e 

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



Change-Id: I712dd867db8dfce5898fc98f079f8a2b53311449
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f8c7ec6a 7adb4d0e

Android.bp

+10 −3
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ filegroup { 
        ":android.hardware.radio.data-V3-java-source",

        ":android.hardware.radio.network-V3-java-source",

        ":android.hardware.radio.voice-V3-java-source",

        ":android.hardware.security.keymint-V3-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.hardware.thermal-V2-java-source",

        ":android.hardware.tv.tuner-V3-java-source",
@@ -116,7 +115,6 @@ filegroup { 
        ":android.security.legacykeystore-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.metrics-java-source",

        ":android.system.keystore2-V4-java-source",

        ":android.hardware.cas-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",
@@ -151,7 +149,16 @@ filegroup { 
        ":framework-javastream-protos",

        ":statslog-framework-java-gen", // FrameworkStatsLog.java

        ":audio_policy_configuration_V7_0",

    ] + select(release_flag("RELEASE_ATTEST_MODULES"), {

        true: [

            ":android.hardware.security.keymint-V4-java-source",

            ":android.system.keystore2-V5-java-source",

        ],

        default: [

            ":android.hardware.security.keymint-V3-java-source",

            ":android.system.keystore2-V4-java-source",

        ],

    }),

}



java_library {