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: Ib123e2cb281ae812cb831c16e2da599bfbc7a2bb

10 files changed, 50 insertions, 0 deletions

diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index 4821eda..5b41e71 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -158,6 +158,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 \
@@ -260,7 +262,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)
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 96c6ebc..5e39f67 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -146,6 +146,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -236,7 +238,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)
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 0362d21..f2eee4f 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -152,6 +152,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 \
@@ -248,7 +250,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)
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 0879bd2..d46ea69 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -248,7 +250,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)
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 4c7e906..e72c139 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -151,6 +151,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 \
@@ -246,7 +248,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)
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 4821eda..5b41e71 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -158,6 +158,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 \
@@ -260,7 +262,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)
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 96c6ebc..5e39f67 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -146,6 +146,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -236,7 +238,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)
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 0362d21..f2eee4f 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -152,6 +152,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 \
@@ -248,7 +250,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)
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 0879bd2..d46ea69 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -152,6 +152,8 @@ LOCAL_CPPFLAGS_Debug := \
 	-Wno-sign-promo
 
 
+LOCAL_FDO_SUPPORT_Debug := false
+
 # Flags passed to both C and C++ files.
 MY_CFLAGS_Release := \
 	--param=ssp-buffer-size=4 \
@@ -248,7 +250,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)
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 4c7e906..e72c139 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -151,6 +151,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 \
@@ -246,7 +248,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)