change variable to public and fixed the build for CAF devices