Merge "Make USE_D8 and USE_R8 read-only"
diff --git a/core/config.mk b/core/config.mk
index 7292f8c..06c73ee 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -580,11 +580,13 @@
 # Work around for b/68406220
 # This should match the soong version.
 USE_D8 := true
+.KATI_READONLY := USE_D8
 
 # Default R8 behavior when USE_R8 is not specified.
 ifndef USE_R8
   USE_R8 := true
 endif
+.KATI_READONLY := USE_R8
 
 #
 # Tools that are prebuilts for TARGET_BUILD_APPS