Revert "meson: nlohmann/json has a meson build"
and Revert "meson: Rework valijson subproject dependency"
This reverts commit 9fedd141288d36d41345305532251e4659535751.
and e7948f447eaeb3afaa78d5d298dc12b0730b8a84.
As they break the yocto build.
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I8034a362f0866342a1527f468dc84a6ff1c67bd7
diff --git a/subprojects/nlohmann_json.wrap b/subprojects/nlohmann.wrap
similarity index 100%
rename from subprojects/nlohmann_json.wrap
rename to subprojects/nlohmann.wrap
diff --git a/subprojects/valijson.wrap b/subprojects/valijson.wrap
index 707c227..736d202 100644
--- a/subprojects/valijson.wrap
+++ b/subprojects/valijson.wrap
@@ -1,3 +1,3 @@
[wrap-git]
-revision = 66262bafb82c946ba583ba33e96d35e633d5898a
+revision = c2f22fddf599d04dc33fcd7ed257c698a05345d9
url = https://github.com/tristanpenman/valijson.git