From cbc7c1b2e1b140fcb1815a95d61b72ccd11e33ba Mon Sep 17 00:00:00 2001 From: bohu Date: Tue, 10 Apr 2018 07:25:30 -0700 Subject: [PATCH] emulator: use puresoftware keymaster Currently emulator is using software keymaster and this module will be removed soon. Based on the suggestion of keymaster team, the puresoftware keymaster should be used instead. removing keystore.goldfish and keystore.ranchu so puresoftware keymaster can be used. BUG: 73378534 Test: build sdk_gphone_x86-userdebug make -j emulator boots to homescreen and pass majority of CtsKeystoreTestCases failures drop from 100+ to 40+ Change-Id: I5093f5a0989e8aad0a69bbae3e8d789d8d8ae1bb --- target/product/emulator.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/product/emulator.mk b/target/product/emulator.mk index 0005cfa9f..8e100be9a 100644 --- a/target/product/emulator.mk +++ b/target/product/emulator.mk @@ -44,8 +44,6 @@ PRODUCT_PACKAGES += \ camera.goldfish.jpeg \ camera.ranchu \ camera.ranchu.jpeg \ - keystore.goldfish \ - keystore.ranchu \ gatekeeper.ranchu \ lights.goldfish \ gps.goldfish \