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

Commit 2d71e807 authored Nov 09, 2023 by Abhishek Nigam Committed by Automerger Merge Worker Nov 09, 2023

Merge changes from topic "nonabrevert" into main am: 80b1a3fc am: 373a50a2

Original change: https://android-review.googlesource.com/c/platform/build/+/2820713

Change-Id: I82128e88f418c70cee7401fcdf1b2d9edd485d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 179283d3 373a50a2

tools/releasetools/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -483,13 +483,8 @@ python_binary_host {
		defaults: ["releasetools_binary_defaults"],
		srcs: [
		"make_recovery_patch.py",
		"non_ab_ota.py",
		"edify_generator.py",
		"check_target_files_vintf.py",
		],
		libs: [
		"ota_utils_lib",
		"ota_metadata_proto",
		"releasetools_common",
		],
		}

tools/releasetools/check_target_files_vintf.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import sys
		import zipfile

		import common
		from apex_manifest import ParseApexManifest

		logger = logging.getLogger(__name__)