diff options
| author | 2014-07-09 07:46:42 +0000 | |
|---|---|---|
| committer | 2014-07-09 05:52:33 +0000 | |
| commit | 608520c8ba1adc7d8d0623b021b7ea509b00751c (patch) | |
| tree | b54355d499c477e882af664372649b7ca5f9f680 | |
| parent | 2cfe30bd592cb6ae63bb4c28ccaf4b069d6ab565 (diff) | |
| parent | 997660dec8b10bba56276f35a9ee8d7ce9d62fc2 (diff) | |
Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
| -rw-r--r-- | build/Android.common_build.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 5cfdbfd816..c39bc5dd63 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -207,6 +207,7 @@ ifndef LIBART_IMG_TARGET_BASE_ADDRESS $(error LIBART_IMG_TARGET_BASE_ADDRESS unset) endif ART_TARGET_CFLAGS := $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) +ART_TARGET_LDFLAGS := ifeq ($(TARGET_CPU_SMP),true) ART_TARGET_CFLAGS += -DANDROID_SMP=1 else @@ -219,6 +220,14 @@ else 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 @@ -277,6 +286,7 @@ ART_TARGET_DEBUG_CFLAGS := $(art_debug_cflags) define set-target-local-cflags-vars LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) LOCAL_CFLAGS_x86 += $(ART_TARGET_CFLAGS_x86) + LOCAL_LDFLAGS += $(ART_TARGET_LDFLAGS) art_target_cflags_ndebug_or_debug := $(1) ifeq ($$(art_target_cflags_ndebug_or_debug),debug) LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS) |