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

Commit b3814f97 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Cleanup python version properties" into main

parents d8ac6c96 62a59c02

ci/Android.bp

+0 −15
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ python_test_host { 
    data: [

        ":py3-cmd",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



// This test is only intended to be run locally since it's slow, not hermetic,
@@ -64,11 +59,6 @@ python_test_host { 
    test_options: {

        unit_test: false,

    },

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



python_test_host {
@@ -88,11 +78,6 @@ python_test_host { 
    data: [

        ":py3-cmd",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



python_binary_host {

tools/Android.bp

+0 −10
Original line number Diff line number Diff line
@@ -85,11 +85,6 @@ python_binary_host { 
    srcs: [

        "list_files.py",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



python_test_host {
@@ -109,11 +104,6 @@ python_test_host { 
python_binary_host {

    name: "characteristics_rro_generator",

    srcs: ["characteristics_rro_generator.py"],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



python_binary_host {

tools/protos/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ package { 


python_library_host {

    name: "metadata_file_proto_py",

    version: {

        py3: {

            enabled: true,

        },

    },

    srcs: [

        "metadata_file.proto",

    ],

tools/releasetools/Android.bp

+0 −15
Original line number Diff line number Diff line
@@ -296,11 +296,6 @@ python_library_host { 


python_defaults {

    name: "releasetools_binary_defaults",

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    // TODO (b/140144201) Build imgdiff from releasetools_common

    required: [

        "aapt2",
@@ -338,11 +333,6 @@ python_library_host { 


python_binary_host {

    name: "merge_ota",

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    srcs: [

        "merge_ota.py",

    ],
@@ -357,11 +347,6 @@ python_binary_host { 


python_binary_host {

    name: "create_brick_ota",

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    srcs: [

        "create_brick_ota.py",

    ],

tools/sbom/Android.bp

+0 −30
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ python_binary_host { 
    srcs: [

        "generate-sbom.py",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    libs: [

        "metadata_file_proto_py",

        "libprotobuf-python",
@@ -45,11 +40,6 @@ python_binary_host { 
    srcs: [

        "gen_sbom.py",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    libs: [

        "compliance_metadata",

        "metadata_file_proto_py",
@@ -78,11 +68,6 @@ python_test_host { 
    libs: [

        "sbom_lib",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    test_suites: ["general-tests"],

}
@@ -95,11 +80,6 @@ python_test_host { 
    libs: [

        "sbom_lib",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    test_suites: ["general-tests"],

}
@@ -108,11 +88,6 @@ python_binary_host { 
    srcs: [

        "generate-sbom-framework_res.py",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    libs: [

        "sbom_lib",

    ],
@@ -123,11 +98,6 @@ python_binary_host { 
    srcs: [

        "gen_notice_xml.py",

    ],

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

    libs: [

        "compliance_metadata",

        "metadata_file_proto_py",