Snap for 6660490 from f00572f20bf48fb47d90a3d71c1dbd5a7c97f8b0 to sdk-release

Change-Id: I56687cda1d48d5ac56df428f96ceaa1bc8a8c945
diff --git a/Android.bp b/Android.bp
index 11e2767..d8a9f3a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4,6 +4,25 @@
 
     srcs: [
         "sgdisk.cc",
+    ],
+    cflags: [
+        "-Wno-unused-parameter",
+        "-Wno-pragma-pack",
+        "-Werror",
+    ],
+
+    shared_libs: ["libext2_uuid"],
+    static_libs: ["libgptf"],
+
+}
+
+cc_library_static {
+    name: "libgptf",
+    host_supported: true,
+
+    export_include_dirs:["."],
+
+    srcs: [
         "gptcl.cc",
         "crc32.cc",
         "support.cc",
@@ -24,10 +43,9 @@
         "-Wno-unused-parameter",
         "-Wno-pragma-pack",
         "-Werror",
+        "-fPIC",
     ],
 
-    shared_libs: ["libext2_uuid"],
-
     target: {
         darwin: {
             cflags: [
@@ -36,4 +54,6 @@
             ],
         },
     },
+
+    shared_libs: ["libext2_uuid"],
 }