commit 1f332cd6182326dcb3d41600fdfcaf95d75ebb0a
author Victor Hsieh <victorhsieh@google.com> Wed May 06 13:25:20 2020 -0700
committer Victor Hsieh <victorhsieh@google.com> Fri May 08 19:28:43 2020 -0700
tree 038f3ef94d4334b6f971871c01f9d9a7f515167b
parent ff20bcd431b09a970f38787a7776d4b177682bbc

This reverts commit 117bd75bfab280c0217488b602fab3107c5d8726.

First API level of cuttlefish is now 30. Remove the opt-in flag since
the feature is required on new R devices.

Bug: 144164497
Test: atest CtsAppSecurityHostTestCases:android.appsecurity.cts.ApkVerityInstallTest
Test: atest ApkVerityTest

Change-Id: I51ffec2a63ad5acc59b7b1ee741191690eb2dab8
Merged-In: I51ffec2a63ad5acc59b7b1ee741191690eb2dab8

shared/device.mk

diff --git a/shared/device.mk b/shared/device.mk
index 2a7c64e..4860b71 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -69,7 +69,6 @@
     ro.opengles.version=196608 \
     wifi.interface=wlan0 \
     persist.sys.zram_enabled=1 \
-    ro.apk_verity.mode=2 \
     ro.rebootescrow.device=/dev/block/pmem0 \
     ro.incremental.enable=1 \