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

Commit 37453749 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove Python enables identical to global defaults." am: 3fd51ff0 am:... 

Merge "Remove Python enables identical to global defaults." am: 3fd51ff0 am: a728156a am: 1c9e3b6c am: 3a47e2f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2220474



Change-Id: Ic89b64fc53e01ae36b3884c117a9242706265327
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 74cc53ca 3a47e2f6

api/Android.bp

+0 −17
Original line number Diff line number Diff line
@@ -38,23 +38,9 @@ bootstrap_go_package { 
    pluginFor: ["soong_build"],

}



python_defaults {

    name: "python3_version_defaults",

    version: {

        py2: {

            enabled: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: false,

        },

    },

}



python_binary_host {

    name: "api_versions_trimmer",

    srcs: ["api_versions_trimmer.py"],

    defaults: ["python3_version_defaults"],

}



python_test_host {
@@ -64,7 +50,6 @@ python_test_host { 
        "api_versions_trimmer_unittests.py",

        "api_versions_trimmer.py",

    ],

    defaults: ["python3_version_defaults"],

    test_options: {

        unit_test: true,

    },
@@ -73,7 +58,6 @@ python_test_host { 
python_binary_host {

    name: "merge_annotation_zips",

    srcs: ["merge_annotation_zips.py"],

    defaults: ["python3_version_defaults"],

}



python_test_host {
@@ -83,7 +67,6 @@ python_test_host { 
        "merge_annotation_zips.py",

        "merge_annotation_zips_test.py",

    ],

    defaults: ["python3_version_defaults"],

    test_options: {

        unit_test: true,

    },

tools/fonts/Android.bp

+0 −5
Original line number Diff line number Diff line
@@ -24,12 +24,7 @@ package { 
python_defaults {

    name: "fonts_python_defaults",

    version: {

        py2: {

            enabled: false,

            embedded_launcher: false,

        },

        py3: {

            enabled: true,

            embedded_launcher: true,

        },

    },