diff --git a/Android.bp b/Android.bp index fea7da0c0b7..ee4a35877d1 100644 --- a/Android.bp +++ b/Android.bp @@ -156,6 +156,7 @@ cc_defaults { "-DREALM_ENABLE_ENCRYPTION=1", "-DREALM_ENABLE_SYNC=1", "-DREALM_ENABLE_GEOSPATIAL=1", + "-DREALM_APP_SERVICES=1", "-DREALM_HAVE_EPOLL=1", "-DREALM_AOSP_VENDOR=1", "-Wno-non-virtual-dtor", diff --git a/CHANGELOG.md b/CHANGELOG.md index 8983cb86887..e63d5b4570e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Fixed * ([#????](https://github.com/realm/realm-core/issues/????), since v?.?.?) * Add a missing file from the bid library to the android blueprint. (PR [#7738](https://github.com/realm/realm-core/pull/7738)) +* Add missing `REALM_APP_SERVICES` flag to the android blueprint. (PR [#7755](https://github.com/realm/realm-core/pull/7755)) ### Breaking changes * None. diff --git a/src/realm/mixed.cpp b/src/realm/mixed.cpp index b5e27125dd4..a687dea7c89 100644 --- a/src/realm/mixed.cpp +++ b/src/realm/mixed.cpp @@ -869,7 +869,7 @@ std::ostream& operator<<(std::ostream& out, const Mixed& m) out << util::serializer::print_value(m.uuid_val); break; case type_Mixed: - REALM_ASSERT(false); + REALM_FALLTHROUGH; default: if (m.is_type(type_List)) { out << "list";