Merge "Additionally run releasetools_test with Python 3." am: 576ae9628b (ef5b2234) · Commits · e / os / android_build

tools/releasetools/Android.bp

+40 −7

Original line number	Diff line number	Diff line
		@@ -13,21 +13,22 @@
		// limitations under the License.

		python_defaults {
		name: "releasetools_test_defaults",
		name: "releasetools_defaults",
		version: {
		py2: {
		enabled: true,
		embedded_launcher: false,
		},
		py3: {
		enabled: false,
		enabled: true,
		embedded_launcher: false,
		},
		},
		}

		python_library_host {
		name: "releasetools_lib",
		defaults: ["releasetools_test_defaults"],
		defaults: ["releasetools_defaults"],
		srcs: [
		"add_img_to_target_files.py",
		"apex_utils.py",
		@@ -53,10 +54,9 @@ python_library_host {
		],
		}

		python_test_host {
		name: "releasetools_test",
		defaults: ["releasetools_test_defaults"],
		main: "test_utils.py",
		python_defaults {
		name: "releasetools_test_defaults",
		defaults: ["releasetools_defaults"],
		srcs: [
		"test_*.py",
		],
		@@ -69,5 +69,38 @@ python_test_host {
		required: [
		"otatools",
		],
		}

		python_test_host {
		name: "releasetools_test",
		defaults: ["releasetools_test_defaults"],
		main: "test_utils.py",
		version: {
		py2: {
		enabled: true,
		embedded_launcher: false,
		},
		py3: {
		enabled: false,
		embedded_launcher: false,
		},
		},
		test_suites: ["general-tests"],
		}

		python_test_host {
		name: "releasetools_py3_test",
		defaults: ["releasetools_test_defaults"],
		main: "test_utils.py",
		version: {
		py2: {
		enabled: false,
		embedded_launcher: false,
		},
		py3: {
		enabled: true,
		embedded_launcher: false,
		},
		},
		test_suites: ["general-tests"],
		}

+4 −0