summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2016-03-22 15:13:12 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-22 15:13:13 +0000
commit9d9a55be9d04b478266c597c56ffeae5d1de1a62 (patch)
treeaedb227563ad1848c905253f1fb02b69b6d04646
parenta17b7d0163fc1309b40ed1c38056b71ef9d147fb (diff)
parent33758d85139ffaa7be240ebb8c5e5f2012dc3541 (diff)
Merge "Only enable asserts on userdebug/eng builds." into nyc-dev
-rw-r--r--packages/DocumentsUI/Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk
index d5e48b5855e7..3197abddb7a3 100644
--- a/packages/DocumentsUI/Android.mk
+++ b/packages/DocumentsUI/Android.mk
@@ -31,9 +31,13 @@ LOCAL_AAPT_FLAGS := \
--extra-packages android.support.v7.recyclerview
LOCAL_JACK_FLAGS := \
- -D jack.assert.policy=enable \
-D jack.optimization.inner-class.accessors=true
+# Only enable asserts on userdebug/eng builds
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+LOCAL_JACK_FLAGS += -D jack.assert.policy=enable
+endif
+
LOCAL_PACKAGE_NAME := DocumentsUI
LOCAL_CERTIFICATE := platform