commit dcb92358c85fb36f3b9d96ba9785d3a8df61d0b3
author Dehao Chen <dehao@google.com> Mon Aug 18 23:12:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 18 23:12:25 2014 +0000
tree af88c07f553c5faa9ae18d185cc3ac4b76199525
parent 1653580011b34b431c39eaca4fb703ef493af5cf
parent 67ce41105eac775f90b129a295489a2ae3265cd1

am 67ce4110: Merge "Check existance of profile directory for specific device." into lmp-dev

* commit '67ce41105eac775f90b129a295489a2ae3265cd1':
  Check existance of profile directory for specific device.

core/combo/fdo.mk

diff --git a/core/combo/fdo.mk b/core/combo/fdo.mk
index 68959c3..a05af6d 100644
--- a/core/combo/fdo.mk
+++ b/core/combo/fdo.mk
@@ -29,10 +29,10 @@
       $(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH := vendor/google_data/fdo_profile
     endif
 
-    ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH))),)
+    ifneq ($(strip $(wildcard $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)/$(PRODUCT_OUT))),)
       $(combo_2nd_arch_prefix)TARGET_FDO_CFLAGS := -fprofile-use=$($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) -DANDROID_FDO -fprofile-correction -Wcoverage-mismatch -Wno-error
     else
-      $(warning Profile directory $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH) does not exist. Turn off FDO.)
+      $(warning Profile directory $($(combo_2nd_arch_prefix)TARGET_FDO_PROFILE_PATH)/$(PRODUCT_OUT) does not exist. Turn off FDO.)
     endif
   endif
 endif