Use gomacc even for FDO build

Goma's client recognizes -fprofile-use= flag so shoulde be
compatible with Android's FDO build.

Change-Id: I0d21d6f530cd05770f8dc12e9dc33a5db49a9c7d

diff --git a/core/binary.mk b/core/binary.mk
index 093cc38..403cff5 100644 (file)
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -254,9 +254,10 @@ ifneq ($(filter true always, $(LOCAL_FDO_SUPPORT)),)
     my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_OPTIMIZE_CFLAGS)
     my_fdo_build := true
   endif
-  # Disable ccache (or other compiler wrapper).
-  my_cc_wrapper :=
-  my_cxx_wrapper :=
+  # Disable ccache (or other compiler wrapper) except gomacc, which
+  # can handle -fprofile-use properly.
+  my_cc_wrapper := $(filter $(GOMA_CC),$(my_cc_wrapper))
+  my_cxx_wrapper := $(filter $(GOMA_CC),$(my_cxx_wrapper))
 endif
 
 ###########################################################

diff --git a/core/goma.mk b/core/goma.mk
index e119829..ddd7d80 100644 (file)
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -42,7 +42,7 @@ ifneq ($(USE_GOMA),)
     goma_dir := $(HOME)/goma
   endif
   goma_ctl := $(goma_dir)/goma_ctl.py
-  goma_cc := $(goma_dir)/gomacc
+  GOMA_CC := $(goma_dir)/gomacc
 
   $(if $(wildcard $(goma_ctl)),, \
    $(warning You should have goma in $$GOMA_DIR or $(HOME)/goma) \
@@ -50,15 +50,14 @@ ifneq ($(USE_GOMA),)
 
   # Append gomacc to existing *_WRAPPER variables so it's possible to
   # use both ccache and gomacc.
-  CC_WRAPPER := $(strip $(CC_WRAPPER) $(goma_cc))
-  CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(goma_cc))
+  CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
+  CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
 
   # gomacc can start goma client's daemon process automatically, but
   # it is safer and faster to start up it beforehand. We run this as a
   # background process so this won't slow down the build.
   $(shell $(goma_ctl) ensure_start &> /dev/null &)
 
-  goma_cc :=
   goma_ctl :=
   goma_dir :=
 endif