Merge "Remove the per-project FDO support. Use the common FDO support from build/core. LOCAL_FDO_SUPPORT indicates if the module should enable FDO builds."
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 207dc55..d55f310 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -247,14 +247,6 @@
endif
endif
ART_TARGET_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS)
-ifdef PGO_GEN
- ART_TARGET_CFLAGS += -fprofile-generate=$(PGO_GEN)
- ART_TARGET_LDFLAGS += -fprofile-generate=$(PGO_GEN)
-endif
-ifdef PGO_USE
- ART_TARGET_CFLAGS += -fprofile-use=$(PGO_USE)
- ART_TARGET_CFLAGS += -fprofile-correction -Wno-error
-endif
# DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is set in ../build/core/dex_preopt.mk based on
# the TARGET_CPU_VARIANT
diff --git a/compiler/Android.mk b/compiler/Android.mk
index 61ff109..69f9387 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -187,6 +187,7 @@
ifeq ($$(art_ndebug_or_debug),ndebug)
LOCAL_MODULE := libart-compiler
LOCAL_SHARED_LIBRARIES += libart
+ LOCAL_FDO_SUPPORT := true
else # debug
LOCAL_MODULE := libartd-compiler
LOCAL_SHARED_LIBRARIES += libartd
diff --git a/runtime/Android.mk b/runtime/Android.mk
index 17d3fce..8fc5e34 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -343,6 +343,7 @@
LOCAL_CPP_EXTENSION := $$(ART_CPP_EXTENSION)
ifeq ($$(art_ndebug_or_debug),ndebug)
LOCAL_MODULE := libart
+ LOCAL_FDO_SUPPORT := true
else # debug
LOCAL_MODULE := libartd
endif