diff --git a/Android.bp b/Android.bp
index 4193306..f62f512 100644
--- a/Android.bp
+++ b/Android.bp
@@ -30,6 +30,20 @@
     sanitize: ["never"],
     stl: "none",
 
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Werror",
+    ],
+
+    arch: {
+        mips: {
+            srcs: ["lib/builtins/clear_cache.c"],
+        },
+        mips64: {
+            srcs: ["lib/builtins/clear_cache.c"],
+        },
+    },
+
     target: {
         windows: {
             enabled: true,
@@ -199,6 +213,11 @@
         "lib/builtins/umodti3.c",
     ],
 
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Werror",
+    ],
+
     arch: {
         arm: {
             cflags: ["-D__ARM_EABI__"],
@@ -269,7 +288,6 @@
         mips64: {
             cflags: [
                 "-DCRT_HAS_128BIT",
-                "-DCRT_LDBL_128BIT",
             ],
         },
         x86: {
@@ -374,6 +392,9 @@
         linux: {
             static_libs: ["libunwindbacktrace"],
         },
+        windows: {
+            static_libs: ["libunwindbacktrace"],
+        },
     },
 
     asflags: ["-integrated-as"],
@@ -384,19 +405,6 @@
     stl: "none",
 }
 
-//=====================================================================
-// Host and device Static Library: libprofile_rt
-//=====================================================================
-
-cc_library_static {
-    name: "libprofile_rt",
-    host_supported: true,
-    clang: true,
-    sanitize: ["never"],
-    srcs: ["lib/profile/GCDAProfiling.c"],
-
-}
-
 // Build asan, lsan, etc.
 // ANDROIDMK TRANSLATION ERROR: unsupported include
 // include $(call all-makefiles-under,$(LOCAL_PATH)/lib)