diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-10-18 15:46:22 +0100 |
| commit | 4e180b6a0b4720a9b8e9e959a882386f690f08ff (patch) | |
| tree | 788435d09362885908ba5ba9ef868b852ca82c0b /media/media_android_jni_headers.target.linux-arm.mk | |
| parent | 1179b92b08db0c652a0cf003ab4d89b31ce3610f (diff) | |
| download | chromium_org-4e180b6a0b4720a9b8e9e959a882386f690f08ff.tar.gz | |
Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
Diffstat (limited to 'media/media_android_jni_headers.target.linux-arm.mk')
| -rw-r--r-- | media/media_android_jni_headers.target.linux-arm.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/media_android_jni_headers.target.linux-arm.mk b/media/media_android_jni_headers.target.linux-arm.mk index 710160fccb..c16ffe1eba 100644 --- a/media/media_android_jni_headers.target.linux-arm.mk +++ b/media/media_android_jni_headers.target.linux-arm.mk @@ -147,7 +147,6 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -226,7 +225,6 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ - '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ |