1 files changed, 25 insertions, 16 deletions

diff --git a/updater/Android.bp b/updater/Android.bp
index 9a36ebbb7..c77bac8fb 100644
--- a/updater/Android.bp
+++ b/updater/Android.bp
@@ -12,27 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_static {
-    name: "libupdater",
+cc_defaults {
+    name: "libupdater_defaults",
 
     defaults: [
         "recovery_defaults",
     ],
 
-    srcs: [
-        "blockimg.cpp",
-        "commands.cpp",
-        "install.cpp",
-    ],
-
-    include_dirs: [
-        "external/e2fsprogs/misc",
-    ],
-
-    export_include_dirs: [
-        "include",
-    ],
-
     static_libs: [
         "libapplypatch",
         "libbootloader_message",
@@ -69,3 +55,26 @@ cc_library_static {
         "libext2fs",
     ],
 }
+
+cc_library_static {
+    name: "libupdater",
+
+    defaults: [
+        "recovery_defaults",
+        "libupdater_defaults",
+    ],
+
+    srcs: [
+        "blockimg.cpp",
+        "commands.cpp",
+        "install.cpp",
+    ],
+
+    include_dirs: [
+        "external/e2fsprogs/misc",
+    ],
+
+    export_include_dirs: [
+        "include",
+    ],
+}