diff --git a/linker/Android.bp b/linker/Android.bp
index 6d93571..5c205d5 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -22,6 +22,7 @@
         "linker_gdb_support.cpp",
         "linker_globals.cpp",
         "linker_libc_support.c",
+        "linker_libcxx_support.cpp",
         "linker_main.cpp",
         "linker_namespaces.cpp",
         "linker_logger.cpp",
@@ -111,6 +112,7 @@
 
     static_libs: [
         "libc_nomalloc",
+        "libm",
         "libziparchive",
         "libutils",
         "libbase",
diff --git a/linker/linker_libcxx_support.cpp b/linker/linker_libcxx_support.cpp
new file mode 100644
index 0000000..0efe4d8
--- /dev/null
+++ b/linker/linker_libcxx_support.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "private/libc_logging.h"
+
+void* __find_icu_symbol(const char* symbol_name __attribute__((__unused__))) {
+  __libc_fatal("__find_icu_symbol should not be called in the linker");
+}