Merge "Change /dalvik-cache to be owned by root."

    LOG_ALWAYS_FATAL_IF((numChars >= PATH_MAX || numChars < 0),

    LOG_ALWAYS_FATAL_IF((numChars >= PATH_MAX || numChars < 0),

            "Error constructing dalvik cache : %s", strerror(errno));

            "Error constructing dalvik cache : %s", strerror(errno));

    int result = mkdir(dalvikCacheDir, 0771);

    int result = mkdir(dalvikCacheDir, 0711);

    LOG_ALWAYS_FATAL_IF((result < 0 && errno != EEXIST),

    LOG_ALWAYS_FATAL_IF((result < 0 && errno != EEXIST),

            "Error creating cache dir %s : %s", dalvikCacheDir, strerror(errno));

            "Error creating cache dir %s : %s", dalvikCacheDir, strerror(errno));

    // We always perform these steps because the directory might

    // We always perform these steps because the directory might

    // already exist, with wider permissions and a different owner

    // already exist, with wider permissions and a different owner

    // than we'd like.

    // than we'd like.

    result = chown(dalvikCacheDir, AID_SYSTEM, AID_SYSTEM);

    result = chown(dalvikCacheDir, AID_ROOT, AID_ROOT);

    LOG_ALWAYS_FATAL_IF((result < 0), "Error changing dalvik-cache ownership : %s", strerror(errno));

    LOG_ALWAYS_FATAL_IF((result < 0), "Error changing dalvik-cache ownership : %s", strerror(errno));

    result = chmod(dalvikCacheDir, 0771);

    result = chmod(dalvikCacheDir, 0711);

    LOG_ALWAYS_FATAL_IF((result < 0),

    LOG_ALWAYS_FATAL_IF((result < 0),

            "Error changing dalvik-cache permissions : %s", strerror(errno));

            "Error changing dalvik-cache permissions : %s", strerror(errno));

}

}