Merge "Only enable asserts on userdebug/eng builds." into nyc-dev

2016-03-22 15:13:12 +00:00
parent a17b7d0163 33758d8513
commit 9d9a55be9d
1 changed files with 5 additions and 1 deletions
--- 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