diff options
| author | 2013-07-30 18:17:17 +0000 | |
|---|---|---|
| committer | 2013-07-30 18:17:17 +0000 | |
| commit | 32e8e0421c34cfbeffdbb35e57751e9c4d8d1fa2 (patch) | |
| tree | b8e2080ee4fb14a99cdf0e1dd74ba8359f6cd2a2 | |
| parent | 0d2155471f6a0df8d193d8132a0b5f740f8e2be8 (diff) | |
| parent | 37c19bc2b36535e686782b7b5d4030d2fb7e2f56 (diff) | |
Merge "Multiple-inclusion protection for Android.common.mk" into dalvik-dev
| -rw-r--r-- | build/Android.common.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index bfb1f9b89b..82097250f9 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -14,6 +14,9 @@ # limitations under the License. # +ifndef ANDROID_COMMON_MK +ANDROID_COMMON_MK = true + # These can be overridden via the environment or by editing to # enable/disable certain build configuration. # @@ -163,11 +166,8 @@ ifneq ($(filter 4.6 4.6.%, $(TARGET_GCC_VERSION)),) else # Warn if not using GCC 4.6 for target builds when not doing a top-level or 'mma' build. ifneq ($(ONE_SHOT_MAKEFILE),) - ifneq ($(ART_THREAD_SAFETY_CHECK_WARNING),true) - # Enable target GCC 4.6 with: export TARGET_GCC_VERSION_EXP=4.6 - $(info Using target GCC $(TARGET_GCC_VERSION) disables thread-safety checks.) - ART_THREAD_SAFETY_CHECK_WARNING := true - endif + # Enable target GCC 4.6 with: export TARGET_GCC_VERSION_EXP=4.6 + $(info Using target GCC $(TARGET_GCC_VERSION) disables thread-safety checks.) endif endif # We build with GCC 4.6 on the host. @@ -219,3 +219,5 @@ ifeq ($(ART_BUILD_HOST_DEBUG),true) ART_BUILD_HOST := true ART_BUILD_DEBUG := true endif + +endif # ANDROID_COMMON_MK |