Snap for 6570104 from b1df146aefe2928280e675b182f3536642ae1c9a to rvc-release (9c6a0639) · Commits · e / os / android_system_core

adb/Android.bp

+7 −7

Original line number	Diff line number	Diff line
		@@ -605,16 +605,14 @@ cc_binary {
		],
		}
		},

		required: [
		"libadbd_auth",
		"libadbd_fs",
		],
		}

		phony {
		name: "adbd_system_binaries",
		// Interface between adbd in a module and the system.
		name: "adbd_system_api",
		required: [
		"libadbd_auth",
		"libadbd_fs",
		"abb",
		"reboot",
		"set-verity-state",
		@@ -622,8 +620,10 @@ phony {
		}

		phony {
		name: "adbd_system_binaries_recovery",
		name: "adbd_system_api_recovery",
		required: [
		"libadbd_auth",
		"libadbd_fs",
		"reboot.recovery",
		],
		}

+10 −1

Original line number	Diff line number	Diff line
		@@ -623,8 +623,11 @@ provides the `aidl_lazy_test_1` interface.
		`stop <service>`
		> Stop a service from running if it is currently running.

		`swapon_all <fstab>`
		`swapon_all [ <fstab> ]`
		> Calls fs\_mgr\_swapon\_all on the given fstab file.
		If the fstab parameter is not specified, fstab.${ro.boot.fstab_suffix},
		fstab.${ro.hardware} or fstab.${ro.hardware.platform} will be scanned for
		under /odm/etc, /vendor/etc, or / at runtime, in that order.

		`symlink <target> <path>`
		> Create a symbolic link at _path_ with the value _target_
		@@ -639,6 +642,12 @@ provides the `aidl_lazy_test_1` interface.
		`umount <path>`
		> Unmount the filesystem mounted at that path.

		`umount_all [ <fstab> ]`
		> Calls fs\_mgr\_umount\_all on the given fstab file.
		If the fstab parameter is not specified, fstab.${ro.boot.fstab_suffix},
		fstab.${ro.hardware} or fstab.${ro.hardware.platform} will be scanned for
		under /odm/etc, /vendor/etc, or / at runtime, in that order.

		`verity_update_state <mount-point>`
		> Internal implementation detail used to update dm-verity state and
		set the partition._mount-point_.verified properties used by adb remount

+13 −3

Original line number	Diff line number	Diff line
		@@ -708,10 +708,20 @@ static Result<void> do_umount_all(const BuiltinArguments& args) {
		return {};
		}

		/* swapon_all [ <fstab> ] */
		static Result<void> do_swapon_all(const BuiltinArguments& args) {
		auto swapon_all = ParseSwaponAll(args.args);
		if (!swapon_all.ok()) return swapon_all.error();

		Fstab fstab;
		if (!ReadFstabFromFile(args[1], &fstab)) {
		return Error() << "Could not read fstab '" << args[1] << "'";
		if (swapon_all->empty()) {
		if (!ReadDefaultFstab(&fstab)) {
		return Error() << "Could not read default fstab";
		}
		} else {
		if (!ReadFstabFromFile(*swapon_all, &fstab)) {
		return Error() << "Could not read fstab '" << *swapon_all << "'";
		}
		}

		if (!fs_mgr_swapon_all(fstab)) {
		@@ -1371,7 +1381,7 @@ const BuiltinFunctionMap& GetBuiltinFunctionMap() {
		{"setrlimit", {3, 3, {false, do_setrlimit}}},
		{"start", {1, 1, {false, do_start}}},
		{"stop", {1, 1, {false, do_stop}}},
		{"swapon_all", {1, 1, {false, do_swapon_all}}},
		{"swapon_all", {0, 1, {false, do_swapon_all}}},
		{"enter_default_mount_ns", {0, 0, {false, do_enter_default_mount_ns}}},
		{"symlink", {2, 2, {true, do_symlink}}},
		{"sysclktz", {1, 1, {false, do_sysclktz}}},

+8 −0

Original line number	Diff line number	Diff line
		@@ -202,6 +202,14 @@ Result<void> check_setrlimit(const BuiltinArguments& args) {
		return {};
		}

		Result<void> check_swapon_all(const BuiltinArguments& args) {
		auto options = ParseSwaponAll(args.args);
		if (!options.ok()) {
		return options.error();
		}
		return {};
		}

		Result<void> check_sysclktz(const BuiltinArguments& args) {
		ReturnIfAnyArgsEmpty();

+1 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ Result<void> check_restorecon(const BuiltinArguments& args);
		Result<void> check_restorecon_recursive(const BuiltinArguments& args);
		Result<void> check_setprop(const BuiltinArguments& args);
		Result<void> check_setrlimit(const BuiltinArguments& args);
		Result<void> check_swapon_all(const BuiltinArguments& args);
		Result<void> check_sysclktz(const BuiltinArguments& args);
		Result<void> check_umount_all(const BuiltinArguments& args);
		Result<void> check_wait(const BuiltinArguments& args);