commit 62cd88d0d1614bbdb643f4cf4f014283b427ec7b
author Ying Wang <wangying@android.com> Wed Sep 04 18:50:48 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 04 18:50:48 2013 +0000
tree 91a6ec3a6bac28487b469aef8bf6176725bc1be2
parent d58df2de78b798f8fc301afcfeb61f574629b8ce
parent 7c4674205c1e2ab4106b99e07434ca31687736ac

Merge "FDO: Only support locally"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 3893d03..d55f814 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -114,7 +114,7 @@
 ####################################################
 ## Add FDO flags if FDO is turned on and supported
 ####################################################
-ifeq ($(strip $(LOCAL_NO_FDO_SUPPORT)),)
+ifneq ($(strip $(LOCAL_FDO_SUPPORT)),)
   ifeq ($(strip $(LOCAL_IS_HOST_MODULE)),)
     LOCAL_CFLAGS += $(TARGET_FDO_CFLAGS)
     LOCAL_CPPFLAGS += $(TARGET_FDO_CFLAGS)

core/clear_vars.mk

diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 7ad58b2..092953d 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -36,7 +36,7 @@
 LOCAL_CXX:=
 LOCAL_CPP_EXTENSION:=
 LOCAL_NO_DEFAULT_COMPILER_FLAGS:=
-LOCAL_NO_FDO_SUPPORT :=
+LOCAL_FDO_SUPPORT:=
 LOCAL_ARM_MODE:=
 LOCAL_YACCFLAGS:=
 LOCAL_ASFLAGS:=