Skip to content

Commit

Permalink
tee-supplicant: remove useless use of __ANDROID__ condition
Browse files Browse the repository at this point in the history
Since commit 37975f1 ("rmpb: update AOSP RPMB device path")
the RPMB device path is the same __ANDROID__ directive being set
or not hence simplify the implementation by removing use of that
directive.

Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
  • Loading branch information
etienne-lms authored and jforissier committed Jun 13, 2024
1 parent 3eac340 commit f1f000b
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions tee-supplicant/src/rpmb.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,7 @@ static int mmc_rpmb_fd(uint16_t dev_id)

DMSG("dev_id = %u", dev_id);
if (fd < 0) {
#ifdef __ANDROID__
snprintf(path, sizeof(path), "/dev/mmcblk%urpmb", dev_id);
#else
snprintf(path, sizeof(path), "/dev/mmcblk%urpmb", dev_id);
#endif
fd = open(path, O_RDWR);
if (fd < 0) {
EMSG("Could not open %s (%s)", path, strerror(errno));
Expand Down

0 comments on commit f1f000b

Please sign in to comment.