From 6f21dfa213d352965a123023282c16cf07461541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Wed, 21 Mar 2018 14:59:41 +0000
Subject: [PATCH] Revert "Revert "Disable R8 for Settings""

This reverts commit f38d78bf0915f169d8f764c63e9c69645845bcb3.

Reason for revert: Enabling R8 again after https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/3769994 lands.

Exempt-From-Owner-Approval: ccross@ made the requested change
Change-Id: I81dcb8c23974d3f3a8c11c39140d17266b4ae18a
---
 Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Android.mk b/Android.mk
index 61851cf1b6d..86abeda7bd7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,9 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 # Build the Settings APK
 include $(CLEAR_VARS)
 
+# See b/74756073.
+LOCAL_USE_R8 := false
+
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform