diff --git a/Android.bp b/Android.bp
index 28fec7f..40c1979 100644
--- a/Android.bp
+++ b/Android.bp
@@ -11,43 +11,22 @@ cc_library_shared {
 
     name: "libwiringPi",
     srcs: [
-        "wiringPi/ads1115.c",
-        "wiringPi/mcp23008.c",
-        "wiringPi/mcp4802.c",
-        "wiringPi/piHiPri.c",
-        "wiringPi/sr595.c",
-        "wiringPi/bmp180.c",
-        "wiringPi/mcp23016.c",
-        "wiringPi/odroidc1.c",
-        "wiringPi/odroidn2.c",
-        "wiringPi/piThread.c",
         "wiringPi/wiringPi.c",
-        "wiringPi/mcp23017.c",
-        "wiringPi/odroidc2.c",
-        "wiringPi/odroidc4.c",
-        "wiringPi/drcSerial.c",
-        "wiringPi/mcp23s08.c",
-        "wiringPi/odroidn1.c",
         "wiringPi/wiringPiI2C.c",
-        "wiringPi/ds18b20.c",
-        "wiringPi/mcp23s17.c",
-        "wiringPi/sn3218.c",
         "wiringPi/wiringPiSPI.c",
-        "wiringPi/htu21d.c",
-        "wiringPi/mcp3002.c",
-        "wiringPi/odroidxu3.c",
-        "wiringPi/softPwm.c",
         "wiringPi/wiringSerial.c",
-        "wiringPi/max31855.c",
-        "wiringPi/mcp3004.c",
-        "wiringPi/pcf8574.c",
-        "wiringPi/softServo.c",
         "wiringPi/wiringShift.c",
-        "wiringPi/max5322.c",
-        "wiringPi/mcp3422.c",
-        "wiringPi/pcf8591.c",
+        "wiringPi/piThread.c",
+        "wiringPi/piHiPri.c",
+        "wiringPi/softPwm.c",
         "wiringPi/softTone.c",
-        "wiringPi/wpiExtensions.c",
+        "wiringPi/softServo.c",
+        "wiringPi/odroidxu3.c",
+        "wiringPi/odroidc1.c",
+        "wiringPi/odroidc2.c",
+        "wiringPi/odroidn1.c",
+        "wiringPi/odroidn2.c",
+        "wiringPi/odroidc4.c",
     ],
 
     vendor_available: true,
@@ -64,59 +43,21 @@ cc_library_shared {
     ],
 }
 
-cc_library_shared {
-    header_libs: ["wiringPi-headers"],
-
-    name: "libwiringPiDev",
-    srcs: [
-        "devLib/ds1302.c",
-        "devLib/maxdetect.c",
-        "devLib/piNes.c",
-        "devLib/gertboard.c",
-        "devLib/lcd128x64.c",
-        "devLib/lcd.c",
-        "devLib/piGlow.c",
-        "devLib/scrollPhat.c",
-        "devLib/piFace.c",
-    ],
-
-    shared_libs: ["libwiringPi"],
-
-    host_ldlibs: [
-        "-ldl",
-        "-llog",
-    ],
-
-    cflags: [
-        "-UNDEBUG",
-        "-DANDROID",
-        "-Wno-return-type",
-    ],
-}
-
 cc_binary {
 
     name: "gpio",
     srcs: [
         "gpio/gpio.c",
         "gpio/readall.c",
-        "gpio/pins.c",
     ],
     header_libs: ["wiringPi-headers"],
 
-    local_include_dirs: [
-        "devLib",
-    ],
-
     cflags: [
         "-UNDEBUG",
         "-DANDROID",
         "-Wno-return-type",
     ],
     host_ldlibs: ["-llog"],
-    shared_libs: [
-        "libwiringPi",
-        "libwiringPiDev",
-    ],
+    shared_libs: ["libwiringPi"],
 
 }