Multiple-inclusion protection for Android.common.mk
Change-Id: I0d228dfacc87f0b50ab1414cb4a46f6010578834
diff --git a/build/Android.common.mk b/build/Android.common.mk
index bfb1f9b..8209725 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 @@
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 @@
ART_BUILD_HOST := true
ART_BUILD_DEBUG := true
endif
+
+endif # ANDROID_COMMON_MK