commit d1482005d4daf4409b0f15bea56764f182acd5de
author Jeff Sharkey <jsharkey@android.com> Tue Mar 22 15:19:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 22 15:19:24 2016 +0000
tree 47b1916f669849aa495baac8a3f9e42c0bb5fdb2
parent 95e092228e1a8d306b369f3d402c8def3243b4a9
parent 9d9a55be9d04b478266c597c56ffeae5d1de1a62

Merge "Only enable asserts on userdebug/eng builds." into nyc-dev
am: 9d9a55b

* commit '9d9a55be9d04b478266c597c56ffeae5d1de1a62':
  Only enable asserts on userdebug/eng builds.

packages/DocumentsUI/Android.mk

diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk
index d5e48b5..3197abd 100644
--- a/packages/DocumentsUI/Android.mk
+++ b/packages/DocumentsUI/Android.mk
@@ -31,9 +31,13 @@
   --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