diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-09-10 10:54:35 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-09-10 10:54:35 +0100 |
| commit | 2dc33605704d570ebd2ab5f0428ea94672ce6a7e (patch) | |
| tree | 9f6b1f3139e451f4f3f311cc028b089afc4c1c9b /modules/bitrate_controller.target.linux-arm.mk | |
| parent | fc979d28cd63985b0cd777068558d892bbaecdfd (diff) | |
| download | webrtc-android-wear-5.0.0_r1.tar.gz | |
Update makefiles after mergeandroid-wear-5.0.0_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-release
Change-Id: I54fd8fa2b5737e4622f9edd92901c13a88159378
Diffstat (limited to 'modules/bitrate_controller.target.linux-arm.mk')
| -rw-r--r-- | modules/bitrate_controller.target.linux-arm.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/bitrate_controller.target.linux-arm.mk b/modules/bitrate_controller.target.linux-arm.mk index 6e97b7cf..dc94a9da 100644 --- a/modules/bitrate_controller.target.linux-arm.mk +++ b/modules/bitrate_controller.target.linux-arm.mk @@ -149,6 +149,8 @@ LOCAL_CPPFLAGS_Debug := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Debug := false + # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ -fstack-protector \ @@ -271,7 +273,10 @@ LOCAL_CPPFLAGS_Release := \ -Wno-sign-promo +LOCAL_FDO_SUPPORT_Release := false + LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_FDO_SUPPORT := $(LOCAL_FDO_SUPPORT_$(GYP_CONFIGURATION)) LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) |