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

Commit ef8d6a68 authored by Krzysztof Kosiński's avatar Krzysztof Kosiński
Browse files

Remove Python enables identical to global defaults. 

Bug: 245854393
Test: presubmit
Change-Id: Ia99d3fc9f1626891d45c55d679f4d8a049f9e1e8
parent 534b797c

linkerconfig/proto/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ cc_library_static { 


python_library_host {

    name: "linker_config_proto",

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

        },

    },

    srcs: [

        "linker_config.proto",

    ],

scripts/hiddenapi/Android.bp

+19 −90
Original line number Diff line number Diff line
@@ -18,29 +18,31 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



python_defaults {

    name: "hiddenapi_defaults",

    version: {

        py3: {

            embedded_launcher: true,

        },

    },

}



python_binary_host {

    name: "analyze_bcpf",

    main: "analyze_bcpf.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["analyze_bcpf.py"],

    // Make sure that the bpmodify tool is built.

    data: [":bpmodify"],

    libs: [

        "signature_trie",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}



python_test_host {

    name: "analyze_bcpf_test",

    main: "analyze_bcpf_test.py",

    defaults: ["hiddenapi_defaults"],

    srcs: [

        "analyze_bcpf.py",

        "analyze_bcpf_test.py",
@@ -50,15 +52,6 @@ python_test_host { 
    libs: [

        "signature_trie",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

    test_options: {

        unit_test: true,

    },
@@ -67,49 +60,25 @@ python_test_host { 
python_binary_host {

    name: "merge_csv",

    main: "merge_csv.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["merge_csv.py"],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}



python_binary_host {

    name: "generate_hiddenapi_lists",

    main: "generate_hiddenapi_lists.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["generate_hiddenapi_lists.py"],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}



python_test_host {

    name: "generate_hiddenapi_lists_test",

    main: "generate_hiddenapi_lists_test.py",

    defaults: ["hiddenapi_defaults"],

    srcs: [

        "generate_hiddenapi_lists.py",

        "generate_hiddenapi_lists_test.py",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

    test_options: {

        unit_test: true,

    },
@@ -123,17 +92,9 @@ python_library_host { 
python_test_host {

    name: "signature_trie_test",

    main: "signature_trie_test.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["signature_trie_test.py"],

    libs: ["signature_trie"],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

    test_options: {

        unit_test: true,

    },
@@ -142,24 +103,17 @@ python_test_host { 
python_binary_host {

    name: "verify_overlaps",

    main: "verify_overlaps.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["verify_overlaps.py"],

    libs: [

        "signature_trie",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}



python_test_host {

    name: "verify_overlaps_test",

    main: "verify_overlaps_test.py",

    defaults: ["hiddenapi_defaults"],

    srcs: [

        "verify_overlaps.py",

        "verify_overlaps_test.py",
@@ -167,15 +121,6 @@ python_test_host { 
    libs: [

        "signature_trie",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

    test_options: {

        unit_test: true,

    },
@@ -184,34 +129,18 @@ python_test_host { 
python_binary_host {

    name: "signature_patterns",

    main: "signature_patterns.py",

    defaults: ["hiddenapi_defaults"],

    srcs: ["signature_patterns.py"],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

}



python_test_host {

    name: "signature_patterns_test",

    main: "signature_patterns_test.py",

    defaults: ["hiddenapi_defaults"],

    srcs: [

        "signature_patterns.py",

        "signature_patterns_test.py",

    ],

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },

    test_options: {

        unit_test: true,

    },