commit 2465fc8594a255d25370be929f63a2fe41129ced
author Daniel Norman <danielnorman@google.com> Wed Mar 02 12:01:20 2022 -0800
committer Daniel Norman <danielnorman@google.com> Thu Mar 10 23:56:00 2022 +0000
tree a40cc0d0417340f1c6e3ee9e8a42d38dce2fcdd5
parent 51005914bdad1ec58554739eddbfcc21fdf3927a

Split the huge merge_target_files script into multiple files.

Bug: 221858722
Test: m otatools; Use to create merged builds
Test: atest --host releasetools_test
Change-Id: I5f932f160d3f6405b41a7721b1c75cc96749e77b

tools/releasetools/merge/Android.bp

diff --git a/tools/releasetools/merge/Android.bp b/tools/releasetools/merge/Android.bp
index c07d8ee..219acf8 100644
--- a/tools/releasetools/merge/Android.bp
+++ b/tools/releasetools/merge/Android.bp
@@ -19,14 +19,20 @@
 filegroup {
     name: "releasetools_merge_sources",
     srcs: [
+        "merge_compatibility_checks.py",
+        "merge_dexopt.py",
+        "merge_meta.py",
         "merge_target_files.py",
+        "merge_utils.py",
     ],
 }
 
 filegroup {
     name: "releasetools_merge_tests",
     srcs: [
-        "test_merge_target_files.py",
+        "test_merge_compatibility_checks.py",
+        "test_merge_meta.py",
+        "test_merge_utils.py",
     ],
 }