Merge "releasetools: Build build_super_image as a lib." am: 7edc2b1994
am: e5f0839c4b

Change-Id: I6460550333a54584e15d00e7895e24a7b983543f
diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index be1444c..0eecb95 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -25,6 +25,14 @@
 }
 
 python_library_host {
+    name: "releasetools_build_super_image",
+    defaults: ["releasetools_library_defaults"],
+    srcs: [
+        "build_super_image.py",
+    ],
+}
+
+python_library_host {
     name: "releasetools_common",
     defaults: ["releasetools_library_defaults"],
     srcs: [
@@ -110,11 +118,11 @@
     name: "merge_builds",
     defaults: ["releasetools_binary_defaults"],
     srcs: [
-        "build_super_image.py",
         "merge_builds.py",
     ],
     main: "merge_builds.py",
     libs: [
+        "releasetools_build_super_image",
         "releasetools_common",
     ],
 }
@@ -141,7 +149,6 @@
         "add_img_to_target_files.py",
         "apex_utils.py",
         "build_image.py",
-        "build_super_image.py",
         "check_ota_package_signature.py",
         "check_target_files_signatures.py",
         "edify_generator.py",
@@ -158,6 +165,7 @@
         "test_*.py",
     ],
     libs: [
+        "releasetools_build_super_image",
         "releasetools_common",
         "releasetools_verity_utils",
     ],