Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 164e9a92 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "installd: add missing <functional> for std::function." into main am:... 

Merge "installd: add missing <functional> for std::function." into main am: a6ec7859 am: e3baf563 am: 33bcca6e am: 11867e36 am: 70bb42b6

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2673909



Change-Id: Ia5999a2369961ccea443b8abfa5238d92753f1ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 651ed13c 70bb42b6

cmds/installd/CrateManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,9 +29,10 @@ 
#include <sys/xattr.h>

#include <unistd.h>



#include <utils.h>

#include <fstream>

#include <functional>

#include <string>

#include <utils.h>



#include "utils.h"

cmds/installd/CrateManager.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sys/stat.h>

#include <sys/types.h>



#include <functional>

#include <optional>

#include <string>

#include <vector>

cmds/installd/utils.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#ifndef UTILS_H_

#define UTILS_H_



#include <functional>

#include <string>

#include <vector>