Revert^2 "Expose AID_KEYSTORE"

Revert submission revert-1660531-max-boot-level-crypto-KFMCEDKSIV

Reason for revert: topic:vold-use-keystore2 has landed fixing the bug

Reverted changes:
Ibf63734a: Revert "Set earlyBootEnded before apex starts"
Id02f63a7: Revert "Expose AID_KEYSTORE"
Ibcedeff4: Revert "Cryptographic security for MAX_BOOT_LEVEL"

Restored changes:
Ia3b968afc:Set earlyBootEnded before apex starts
Ia69891291:Expose AID_KEYSTORE
I12530cd13:Cryptographic security for MAX_BOOT_LEVEL

Reverted-SHA1: a801eabe11

Original commit message:
Keystore uses this as the user ID for keys that it creates for its
own use.

Bug: 176450483
Test: atest com.android.tests.odsign.OnDeviceSigningHostTest#verifyArtUpgradeSignsFiles
Change-Id: I0e2baa8807281ec9e5cc0a9ff8daff191285a600
This commit is contained in:
Paul Crowley 2021-04-08 17:04:43 +00:00
parent b20e9a3606
commit 37a413d1c3
1 changed files with 2 additions and 1 deletions

View File

@ -363,8 +363,9 @@ rust_bindgen {
local_include_dirs: ["include"], local_include_dirs: ["include"],
bindgen_flags: [ bindgen_flags: [
"--whitelist-function", "multiuser_get_app_id", "--whitelist-function", "multiuser_get_app_id",
"--whitelist-function", "multiuser_get_user_id",
"--whitelist-function", "multiuser_get_uid", "--whitelist-function", "multiuser_get_uid",
"--whitelist-function", "multiuser_get_user_id",
"--whitelist-var", "AID_KEYSTORE",
"--whitelist-var", "AID_USER_OFFSET", "--whitelist-var", "AID_USER_OFFSET",
], ],
} }