am 21b2216e: Add NOTICE and MODULE_LICENSE_APACHE2 for art
* commit '21b2216e4aa3756b5f96a587e99ac4fd0b16b844':
Add NOTICE and MODULE_LICENSE_APACHE2 for art
diff --git a/dalvikvm/dalvikvm.cc b/dalvikvm/dalvikvm.cc
index 4607f9a..ea8461f 100644
--- a/dalvikvm/dalvikvm.cc
+++ b/dalvikvm/dalvikvm.cc
@@ -16,6 +16,7 @@
#include <signal.h>
+#include <algorithm>
#include <cstdio>
#include <cstring>
#include <string>
diff --git a/runtime/Android.mk b/runtime/Android.mk
index a0ae4bf..459ca0e 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -178,6 +178,7 @@
runtime_android.cc \
thread_android.cc
+LIBART_LDFLAGS :=
ifeq ($(TARGET_ARCH),arm)
LIBART_TARGET_SRC_FILES += \
arch/arm/context_arm.cc.arm \
@@ -195,6 +196,7 @@
arch/x86/portable_entrypoints_x86.S \
arch/x86/quick_entrypoints_x86.S \
arch/x86/thread_x86.cc
+LIBART_LDFLAGS += -Wl,--no-fatal-warnings
else # TARGET_ARCH != x86
ifeq ($(TARGET_ARCH),mips)
LIBART_TARGET_SRC_FILES += \
@@ -304,6 +306,7 @@
LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN)
LOCAL_CFLAGS := $(LIBART_CFLAGS)
+ LOCAL_LDFLAGS := $(LIBART_LDFLAGS)
ifeq ($$(art_target_or_host),target)
LOCAL_CLANG := $(ART_TARGET_CLANG)
LOCAL_CFLAGS += $(ART_TARGET_CFLAGS)