Merge "Use -Werror in system/libhidl"
diff --git a/adapter/Android.bp b/adapter/Android.bp
index 9bedb7b..a814e10 100644
--- a/adapter/Android.bp
+++ b/adapter/Android.bp
@@ -14,6 +14,7 @@
 
 cc_library_shared {
     name: "libhidladapter",
+    defaults: ["libhidl-defaults"],
     vendor_available: true,
     srcs: [
         "HidlBinderAdapter.cpp"
diff --git a/transport/token/1.0/utils/Android.bp b/transport/token/1.0/utils/Android.bp
index b37faf5..fcb1613 100644
--- a/transport/token/1.0/utils/Android.bp
+++ b/transport/token/1.0/utils/Android.bp
@@ -14,6 +14,7 @@
 
 cc_library {
     name: "android.hidl.token@1.0-utils",
+    defaults: ["libhidl-defaults"],
     vendor_available: true,
     vndk: {
         enabled: true,