From 7c3c275b4d0100eec36f7b66637a7aace7971466 Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Tue, 28 Jul 2015 15:11:14 -0700
Subject: stagefright: disable automatic experiments

allow manually-enabled experiments only in eng and userdebug builds

Bug: 20894667
Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
---
 media/libmediaplayerservice/nuplayer/Android.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'media/libmediaplayerservice/nuplayer/Android.mk')

diff --git a/media/libmediaplayerservice/nuplayer/Android.mk b/media/libmediaplayerservice/nuplayer/Android.mk
index cc6f743..cd20837 100644
--- a/media/libmediaplayerservice/nuplayer/Android.mk
+++ b/media/libmediaplayerservice/nuplayer/Android.mk
@@ -25,7 +25,12 @@ LOCAL_C_INCLUDES := \
 	$(TOP)/frameworks/av/media/libmediaplayerservice              \
 	$(TOP)/frameworks/native/include/media/openmax
 
-LOCAL_CFLAGS += -Werror -Wall -DENABLE_STAGEFRIGHT_EXPERIMENTS
+LOCAL_CFLAGS += -Werror -Wall
+
+# enable experiments only in userdebug and eng builds
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS += -DENABLE_STAGEFRIGHT_EXPERIMENTS
+endif
 
 LOCAL_CLANG := true
 
-- 
cgit v1.1