Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b0b9ca1 authored by Daniel Norman's avatar Daniel Norman
Browse files

Moves merge scripts into a new merge folder. 

This will be used in the following change to split
merge_target_files into a collection of smaller
more-focused scripts.

Bug: 221858722
Test: m otatools; Use to create merged builds
Change-Id: Ie01dac81c5f9f28f1e0fe037259eabd2478e60b6
parent ff35cbd1

tools/releasetools/Android.bp

+2 −41
Original line number Diff line number Diff line
@@ -437,46 +437,6 @@ python_binary_host { 
    ],

}



python_binary_host {

    name: "merge_builds",

    defaults: ["releasetools_binary_defaults"],

    srcs: [

        "merge_builds.py",

    ],

    libs: [

        "releasetools_build_super_image",

        "releasetools_common",

    ],

}



python_binary_host {

    name: "merge_target_files",

    defaults: ["releasetools_binary_defaults"],

    srcs: [

        "merge_target_files.py",

    ],

    libs: [

        "releasetools_add_img_to_target_files",

        "releasetools_build_super_image",

        "releasetools_check_target_files_vintf",

        "releasetools_common",

        "releasetools_find_shareduid_violation",

        "releasetools_img_from_target_files",

        "releasetools_ota_from_target_files",

    ],

    required: [

        "checkvintf",

        "host_init_verifier",

        "secilc",

    ],

    target: {

        darwin: {

            // libs dep "releasetools_ota_from_target_files" is disabled on darwin

            enabled: false,

        },

    },

}



python_binary_host {

    name: "ota_from_target_files",

    defaults: [
@@ -595,11 +555,12 @@ python_defaults { 
        "check_partition_sizes.py",

        "check_target_files_signatures.py",

        "make_recovery_patch.py",

        "merge_target_files.py",

        "ota_package_parser.py",

        "sign_apex.py",

        "sign_target_files_apks.py",

        "validate_target_files.py",

        ":releasetools_merge_sources",

        ":releasetools_merge_tests",



        "test_*.py",

    ],

tools/releasetools/OWNERS

+0 −3
Original line number Diff line number Diff line 
elsk@google.com

nhdo@google.com

zhangkelvin@google.com
 


per-file *merge_*.py = danielnorman@google.com, jgalmes@google.com, rseymour@google.com

tools/releasetools/merge/Android.bp

0 → 100644
+69 −0
Original line number Diff line number Diff line 
// Copyright (C) 2022 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "releasetools_merge_sources",

    srcs: [

        "merge_target_files.py",

    ],

}



filegroup {

    name: "releasetools_merge_tests",

    srcs: [

        "test_merge_target_files.py",

    ],

}



python_binary_host {

    name: "merge_target_files",

    defaults: ["releasetools_binary_defaults"],

    srcs: [":releasetools_merge_sources"],

    libs: [

        "releasetools_add_img_to_target_files",

        "releasetools_build_super_image",

        "releasetools_check_target_files_vintf",

        "releasetools_common",

        "releasetools_find_shareduid_violation",

        "releasetools_img_from_target_files",

        "releasetools_ota_from_target_files",

    ],

    required: [

        "checkvintf",

        "host_init_verifier",

        "secilc",

    ],

    target: {

        darwin: {

            // libs dep "releasetools_ota_from_target_files" is disabled on darwin

            enabled: false,

        },

    },

}



python_binary_host {

    name: "merge_builds",

    defaults: ["releasetools_binary_defaults"],

    srcs: [

        "merge_builds.py",

    ],

    libs: [

        "releasetools_build_super_image",

        "releasetools_common",

    ],

}

tools/releasetools/merge/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
danielnorman@google.com

jgalmes@google.com

rseymour@google.com