diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:45 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:45 +0000 |
| commit | 6ae5588d130a64ab44e9892495f138e67ce1d6de (patch) | |
| tree | 9df285f52e7097102c77a9748b98d782bd3e1fd9 /system_wrappers/source/cpu_features_android.target.linux-arm.mk | |
| parent | 8d9f6d0c63b44c0af134da69275996db811e4d96 (diff) | |
| download | webrtc-6ae5588d130a64ab44e9892495f138e67ce1d6de.tar.gz | |
Update makefiles after merge of Chromium at 256489
This commit was generated by merge_from_chromium.py.
Change-Id: If4b80a409438e889814eb680645a98a4b196dfb1
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
| -rw-r--r-- | system_wrappers/source/cpu_features_android.target.linux-arm.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index 50265677..b74d1108 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -78,7 +78,6 @@ MY_DEFS_Debug := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -93,6 +92,7 @@ MY_DEFS_Debug := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -178,7 +178,6 @@ MY_DEFS_Release := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -193,6 +192,7 @@ MY_DEFS_Release := \ '-DWEBRTC_LINUX' \ '-DWEBRTC_ANDROID' \ '-DWEBRTC_ANDROID_OPENSLES' \ + '-DUSE_OPENSSL=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |