summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-07-28 15:11:14 -0700
committerLajos Molnar <lajos@google.com>2015-07-29 15:44:30 -0700
commit7c3c275b4d0100eec36f7b66637a7aace7971466 (patch)
tree7fcd01c703060898c9355d99615afff7b13c7958 /media/libmediaplayerservice
parenta7d36c184562cc15b2d665ff25c485fefdcfbabd (diff)
downloadframeworks_av-7c3c275b4d0100eec36f7b66637a7aace7971466.zip
frameworks_av-7c3c275b4d0100eec36f7b66637a7aace7971466.tar.gz
frameworks_av-7c3c275b4d0100eec36f7b66637a7aace7971466.tar.bz2
stagefright: disable automatic experiments
allow manually-enabled experiments only in eng and userdebug builds Bug: 20894667 Change-Id: Ie6c93e9482a84ed3aaf6aa0abd909f14cfea4e9b
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/Android.mk7
1 files changed, 6 insertions, 1 deletions
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