Revert "Revert "Split out libhidl-gen and libhidl-gen-utils.""
Shared code between hidl-gen, c2hal, and VTS.
Also build for device, as we might use libhidl-gen reflectively in
future (for profiling and instrumentation).
Change-Id: Ia56901f4afbc12b7c2abee693e0ebea97ba76a8b
diff --git a/generateCpp.cpp b/generateCpp.cpp
index e0f3f41..3543e97 100644
--- a/generateCpp.cpp
+++ b/generateCpp.cpp
@@ -18,14 +18,14 @@
#include "Coordinator.h"
#include "EnumType.h"
-#include "Formatter.h"
#include "Interface.h"
#include "Method.h"
#include "ScalarType.h"
#include "Scope.h"
-#include "StringHelper.h"
#include <algorithm>
+#include <hidl-util/StringHelper.h>
+#include <hidl-util/Formatter.h>
#include <android-base/logging.h>
#include <string>
#include <vector>