Skip to content

nlohmann to 3.12.0#1454

Merged
pablo-msft merged 5 commits into
mainfrom
user/pablo/nlohmann
May 28, 2026
Merged

nlohmann to 3.12.0#1454
pablo-msft merged 5 commits into
mainfrom
user/pablo/nlohmann

Conversation

@pablo-msft
Copy link
Copy Markdown
Contributor

No description provided.

@pablo-msft pablo-msft requested a review from a team as a code owner May 27, 2026 22:12
@bmehta001 bmehta001 requested a review from Copilot May 27, 2026 22:32
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the vendored nlohmann/json dependency to 3.12.0 and adds the upstream MIT license alongside the root vendored copy.

Changes:

  • Bumps the nlohmann/json commit in cgmanifest.json.
  • Adds nlohmann/LICENSE.MIT.
  • Updates the root nlohmann/json.hpp snapshot to 3.12.0.

Reviewed changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 1 comment.

File Description
cgmanifest.json Registers the updated upstream nlohmann/json commit.
nlohmann/LICENSE.MIT Adds the MIT license text for the vendored nlohmann/json copy.
nlohmann/json.hpp Updates the root vendored header to nlohmann/json 3.12.0.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread cgmanifest.json
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 3 out of 5 changed files in this pull request and generated no new comments.

@bmehta001
Copy link
Copy Markdown
Contributor

One integration issue worth fixing before merge: Android.bp should add the repo root to local_include_dirs.

This PR removes lib/include/mat/json.hpp and leaves the canonical header at nlohmann/json.hpp from the repo root. Gradle/CMake Android builds already include ${SDK_ROOT}, but the Soong Android.bp path only lists lib, lib/include/public, lib/include, and lib/include/mat. Please add "." so Soong builds resolve <nlohmann/json.hpp> explicitly:

local_include_dirs: [
    ".",
    "lib",
    "lib/include/public",
    "lib/include",
    "lib/include/mat",
],

Everything else I checked looks good: the vendored header matches upstream v3.12.0 after line-ending normalization, cgmanifest points at the v3.12.0 commit, and repo code already includes <nlohmann/json.hpp> rather than lib/include/mat/json.hpp.

@pablo-msft pablo-msft merged commit bde947f into main May 28, 2026
26 of 29 checks passed
@pablo-msft pablo-msft deleted the user/pablo/nlohmann branch May 28, 2026 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants