commit ae90c07c9786622acf9ee329282161ed9aea011e
author Ying Wang <wangying@google.com> Sat Dec 20 00:52:24 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 20 00:52:24 2014 +0000
tree e21489312aa0bb22145a3a7f7bb96a34980878ad
parent b3ad3943f363ab7c60d17125ac871e31c25b8a7a
parent cf6f808408fa69d6643fed5a38758cbf22f3b0c0

Merge "Disable transitive symbol resolving for arm64."

core/clang/arm.mk

diff --git a/core/clang/arm.mk b/core/clang/arm.mk
index ceb4a5a..f76a182 100644
--- a/core/clang/arm.mk
+++ b/core/clang/arm.mk
@@ -10,6 +10,11 @@
   CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=krait
 endif
 
+ifeq ($(HOST_OS),darwin)
+  # Darwin is really bad at dealing with idiv/sdiv. Don't use krait on Darwin.
+  CLANG_CONFIG_arm_EXTRA_CFLAGS += -mcpu=cortex-a9
+endif
+
 CLANG_CONFIG_arm_EXTRA_CPPFLAGS :=
 
 CLANG_CONFIG_arm_EXTRA_LDFLAGS :=

target/product/embedded.mk

diff --git a/target/product/embedded.mk b/target/product/embedded.mk
index fb6ea42..aae7f95 100644
--- a/target/product/embedded.mk
+++ b/target/product/embedded.mk
@@ -50,6 +50,7 @@
     libpower \
     libsigchain \
     libstdc++ \
+    libstlport \
     libsurfaceflinger \
     libsurfaceflinger_ddmconnection \
     libsysutils \