commit db48ce2ba9acb8408847efcb027b064e6f202a37
author Shaju Mathew <shaju@google.com> Thu May 26 14:59:50 2022 -0700
committer Shaju Mathew <shaju@google.com> Fri May 27 02:41:50 2022 -0700
tree abfd36d807fb55ed1718e0c93f8b122731fd72e1
parent adae76698657a6b513825aecfdc2201dd1774fb1

Configuration for preprocessor symbol ALLOW_DISABLE_VERITY (followup for:
f61f41494e).

disable-verity fails with incorrect error message in userdebug.

Bug: b/232742280

Test: Manual.

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: Icc00433710452e5dca8f5e8e997df2c72e23e4b4

set-verity-state/Android.bp

diff --git a/set-verity-state/Android.bp b/set-verity-state/Android.bp
index 2f0cb10..f0df350 100644
--- a/set-verity-state/Android.bp
+++ b/set-verity-state/Android.bp
@@ -22,6 +22,17 @@
     ],
 
     cflags: ["-Werror"],
+    cppflags: [
+        "-DALLOW_DISABLE_VERITY=0",
+    ],
+    product_variables: {
+        debuggable: {
+            cppflags: [
+                "-UALLOW_DISABLE_VERITY",
+                "-DALLOW_DISABLE_VERITY=1",
+            ],
+        },
+    },
     symlinks: [
         "enable-verity",
         "disable-verity",