Merge "Remove embedded_launcher: true usages" into main (dd4f5537) · Commits · e / os / android_build_soong

provenance/tools/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -23,11 +23,6 @@ python_binary_host {
		srcs: [
		"gen_provenance_metadata.py",
		],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		libs: [
		"provenance_metadata_proto",
		"libprotobuf-python",

python/tests/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -27,9 +27,4 @@ python_test_host {
		test_options: {
		unit_test: false,
		},
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		}

python/tests/dont_import_folder_of_entrypoint/Android.bp

+0 −14

Original line number	Diff line number	Diff line
		@@ -10,17 +10,3 @@ python_test_host {
		"mypkg/mymodule.py",
		],
		}

		python_test_host {
		name: "py_dont_import_folder_of_entrypoint_test_embedded_launcher",
		main: "mypkg/main.py",
		srcs: [
		"mypkg/main.py",
		"mypkg/mymodule.py",
		],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		}

scripts/Android.bp

+0 −20

Original line number	Diff line number	Diff line
		@@ -29,11 +29,6 @@ python_test_host {
		"manifest_fixer_test.py",
		"manifest_fixer.py",
		],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		libs: [
		"manifest_utils",
		],
		@@ -214,11 +209,6 @@ python_binary_host {
		srcs: [
		"conv_linker_config.py",
		],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		libs: [
		"linker_config_proto",
		],
		@@ -299,20 +289,10 @@ python_binary_host {
		srcs: [
		"merge_directories.py",
		],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		}

		python_binary_host {
		name: "buildinfo",
		main: "buildinfo.py",
		srcs: ["buildinfo.py"],
		version: {
		py3: {
		embedded_launcher: true,
		},
		},
		}

scripts/hiddenapi/Android.bp

+0 −19

Original line number	Diff line number	Diff line
		@@ -18,19 +18,9 @@ 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"],
		@@ -42,7 +32,6 @@ python_binary_host {
		python_test_host {
		name: "analyze_bcpf_test",
		main: "analyze_bcpf_test.py",
		defaults: ["hiddenapi_defaults"],
		srcs: [
		"analyze_bcpf.py",
		"analyze_bcpf_test.py",
		@@ -60,21 +49,18 @@ python_test_host {
		python_binary_host {
		name: "merge_csv",
		main: "merge_csv.py",
		defaults: ["hiddenapi_defaults"],
		srcs: ["merge_csv.py"],
		}

		python_binary_host {
		name: "generate_hiddenapi_lists",
		main: "generate_hiddenapi_lists.py",
		defaults: ["hiddenapi_defaults"],
		srcs: ["generate_hiddenapi_lists.py"],
		}

		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",
		@@ -92,7 +78,6 @@ 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"],
		test_options: {
		@@ -103,7 +88,6 @@ python_test_host {
		python_binary_host {
		name: "verify_overlaps",
		main: "verify_overlaps.py",
		defaults: ["hiddenapi_defaults"],
		srcs: ["verify_overlaps.py"],
		libs: [
		"signature_trie",
		@@ -113,7 +97,6 @@ python_binary_host {
		python_test_host {
		name: "verify_overlaps_test",
		main: "verify_overlaps_test.py",
		defaults: ["hiddenapi_defaults"],
		srcs: [
		"verify_overlaps.py",
		"verify_overlaps_test.py",
		@@ -129,14 +112,12 @@ python_test_host {
		python_binary_host {
		name: "signature_patterns",
		main: "signature_patterns.py",
		defaults: ["hiddenapi_defaults"],
		srcs: ["signature_patterns.py"],
		}

		python_test_host {
		name: "signature_patterns_test",
		main: "signature_patterns_test.py",
		defaults: ["hiddenapi_defaults"],
		srcs: [
		"signature_patterns.py",
		"signature_patterns_test.py",