commit e9381754b4f78c11070e75fc8faeb0b3d319053e
author Colin Cross <ccross@android.com> Tue Jun 19 10:23:50 2018 -0700
committer Colin Cross <ccross@android.com> Mon Jun 25 14:18:42 2018 -0700
tree fc12282c79548079ea1382ea7e6d68ef4fcc3115
parent 674454f223f5185c2ed15ed6fd0bddda048e6469

Make USE_D8 and USE_R8 read-only

Confusion between LOCAL_USE_R8 and USE_R8 caused USE_R8 := false
to be set in an Android.mk file, which changed the behavior of
half of the build.  Make USE_R8 and USE_D8 read-only to prevent
it from happening again.

Test: m checkbuild
Bug: 110033958
Change-Id: I09a8fbf3d7f8e4b3f0cb3de538870f925d5d0abe

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 3045929..b2f4201 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -572,11 +572,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