Merge "Keep RECOVERY_API_VERSION and RECOVERY_FSTAB_VERSION in sync." into main (169b98c4) · Commits · e / os / android_bootable_recovery

Android.bp

+22 −10

Original line number	Diff line number	Diff line
		@@ -49,18 +49,30 @@ license {
		],
		}

		cc_defaults {
		soong_config_module_type {
		name: "recovery_cc_defaults",
		module_type: "cc_defaults",
		config_namespace: "recovery",
		value_variables: ["recovery_api_version"],
		properties: [
		"cflags",
		],
		}

		recovery_cc_defaults {
		name: "recovery_defaults",

		soong_config_variables: {
		recovery_api_version: {
		cflags: [
		"-D_FILE_OFFSET_BITS=64",

		// Must be the same as RECOVERY_API_VERSION.
		"-DRECOVERY_API_VERSION=3",

		"-DRECOVERY_API_VERSION=%s",
		"-Wall",
		"-Werror",
		],
		},
		},
		}

		cc_library_static {

+0 −4

Original line number	Diff line number	Diff line
		@@ -14,10 +14,6 @@

		LOCAL_PATH := $(call my-dir)

		# Needed by build/make/core/Makefile. Must be consistent with the value in Android.bp.
		RECOVERY_API_VERSION := 3
		RECOVERY_FSTAB_VERSION := 2

		# TARGET_RECOVERY_UI_LIB should be one of librecovery_ui_{default,wear,vr,ethernet} or a
		# device-specific module that defines make_device() and the exact RecoveryUI class for the
		# target. It defaults to librecovery_ui_default, which uses ScreenRecoveryUI.