Make change and version bump to BP2A.250208.001 (5f4e0b87) · Commits · e / os / android_build

Changes.md

+2 −8

Original line number	Diff line number	Diff line
		@@ -40,14 +40,8 @@ within a product configuration .mk file, board config .mk file, or buildspec.mk.

		## Python 2 to 3 migration

		The path set when running builds now makes the `python` executable point to python 3,
		whereas on previous versions it pointed to python 2. If you still have python 2 scripts,
		you can change the shebang line to use `python2` explicitly. This only applies for
		scripts run directly from makefiles, or from soong genrules.

		In addition, `python_*` soong modules no longer allow python 2.

		Python 2 is slated for complete removal in V.
		Python 2 has been completely removed from the build. Please migrate any remaining usages to
		Python 3, and remove any version-specific properties from bp files.

		## Stop referencing sysprop_library directly from cc modules

core/Makefile

+0 −5

Original line number	Diff line number	Diff line
		@@ -295,11 +295,6 @@ ndk-docs: $(ndk_doxygen_out)/index.html
		.PHONY: ndk-docs
		endif

		ifeq ($(HOST_OS),linux)
		$(call dist-for-goals,sdk,$(API_FINGERPRINT))
		$(call dist-for-goals,droidcore,$(API_FINGERPRINT))
		endif

		INSTALLED_RECOVERYIMAGE_TARGET :=
		# Build recovery image if
		# BUILDING_RECOVERY_IMAGE && !BOARD_USES_RECOVERY_AS_BOOT && !BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT.

core/build_id.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,4 +18,4 @@
		# (like "CRB01"). It must be a single word, and is
		# capitalized by convention.

		BUILD_ID=BP2A.250207.004
		BUILD_ID=BP2A.250208.001

core/ninja_config.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ PARSE_TIME_MAKE_GOALS := \
		build-art% \
		build_kernel-nodeps \
		clean-oat% \
		continuous_instrumentation_tests \
		continuous_native_tests \
		cts \
		custom_images \
		dicttool_aosp \

tools/releasetools/fsverity_metadata_generator.py

+23 −5

Original line number	Diff line number	Diff line
		@@ -104,16 +104,13 @@ class FSVerityMetadataGenerator:
		out = subprocess.check_output(cmd, universal_newlines=True).strip()
		return bytes(bytearray.fromhex(out))

		def generate(self, input_file, output_file=None):
		def generate(self, input_file, output_file):
		if self._signature != 'none':
		if not self._key:
		raise RuntimeError("key must be specified.")
		if not self._cert:
		raise RuntimeError("cert must be specified.")

		if not output_file:
		output_file = input_file + '.fsv_meta'

		with TempDirectory() as temp_dir:
		self._do_generate(input_file, output_file, temp_dir)

		@@ -229,6 +226,27 @@ if __name__ == '__main__':
		required=True)
		args = p.parse_args(sys.argv[1:])

		output_file = args.output
		if not output_file:
		output_file = input_file + '.fsv_meta'

		if output_file != args.input + '.fsv_meta':
		sys.exit('When generating .fsv_meta files for symlinks, we assume that all fsv_meta files '
		'are named the same as the file they protect, just with the .fsv_meta suffix appended. '
		'We require that all .fsv_meta files follow this convention regardless of if it\'s a link or '
		'not. However {args.input} had a different output file: {args.output}')

		# remove the output file first, as switching between a file and a symlink can be complicated
		try:
		os.remove(output_file)
		except FileNotFoundError:
		pass

		if os.path.islink(args.input):
		target = os.readlink(args.input) + '.fsv_meta'
		os.symlink(target, output_file)
		sys.exit(0)

		generator = FSVerityMetadataGenerator(args.fsverity_path)
		generator.set_signature(args.signature)
		if args.signature == 'none':
		@@ -241,4 +259,4 @@ if __name__ == '__main__':
		generator.set_cert(args.cert)
		generator.set_key_format(args.key_format)
		generator.set_hash_alg(args.hash_alg)
		generator.generate(args.input, args.output)
		generator.generate(args.input, output_file)