Snap for 4683893 from 8dfb2193aaac22f8f0ff48bce1e23e6823b6bea9 to pi-release

Change-Id: I5a8cc1a1cc2c9047b3cc6359922b6e40a3eda62d
diff --git a/Android.bp b/Android.bp
index bfbcdf7..6350262 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,3 +57,25 @@
 GEN_SERVICE_SOURCE = GEN_SERVICE + " --nos-client-cpp_out=source:$(genDir) "
 GEN_SERVICE_HEADER = GEN_SERVICE + " --nos-client-cpp_out=header:$(genDir) "
 GEN_SERVICE_MOCK = GEN_SERVICE + " --nos-client-cpp_out=mock:$(genDir) "
+
+// A special target to be statically linkeed into recovery which is a system
+// (not vendor) component.
+cc_library_static {
+    name: "libnos_for_recovery",
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wno-zero-length-array",
+    ],
+    export_include_dirs: [
+        "nugget/include",
+        "libnos/include",
+        "libnos_datagram/include",
+        "libnos_transport/include",
+    ],
+    srcs: [
+        "libnos/debug.cpp",
+        "libnos_transport/transport.c",
+    ],
+}