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

Commit 9740501d authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6436225 from 19685064 to rvc-release

Change-Id: I6a68eda40aa09f306229584dd396ad7b99e52782
parents 60264d77 19685064
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ class _NODISCARD_ expected {
                !std::is_same_v<unexpected<E>, std::remove_cv_t<std::remove_reference_t<U>>> &&
                std::is_convertible_v<U&&, T> /* non-explicit */
                )>
  // NOLINTNEXTLINE(google-explicit-constructor)
  // NOLINTNEXTLINE(google-explicit-constructor,bugprone-forwarding-reference-overload)
  constexpr expected(U&& v) : var_(std::in_place_index<0>, std::forward<U>(v)) {}

  template <class U = T _ENABLE_IF(
@@ -192,6 +192,7 @@ class _NODISCARD_ expected {
                !std::is_same_v<unexpected<E>, std::remove_cv_t<std::remove_reference_t<U>>> &&
                !std::is_convertible_v<U&&, T> /* explicit */
                )>
  // NOLINTNEXTLINE(bugprone-forwarding-reference-overload)
  constexpr explicit expected(U&& v) : var_(std::in_place_index<0>, T(std::forward<U>(v))) {}

  template<class G = E _ENABLE_IF(
@@ -607,7 +608,7 @@ class unexpected {
                std::is_constructible_v<E, Err> &&
                !std::is_same_v<std::remove_cv_t<std::remove_reference_t<E>>, std::in_place_t> &&
                !std::is_same_v<std::remove_cv_t<std::remove_reference_t<E>>, unexpected>)>
  // NOLINTNEXTLINE(google-explicit-constructor)
  // NOLINTNEXTLINE(google-explicit-constructor,bugprone-forwarding-reference-overload)
  constexpr unexpected(Err&& e) : val_(std::forward<Err>(e)) {}

  template<class U, class... Args _ENABLE_IF(
+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ class Error {

  template <typename T>
  Error& operator<<(T&& t) {
    // NOLINTNEXTLINE(bugprone-suspicious-semicolon)
    if constexpr (std::is_same_v<std::remove_cv_t<std::remove_reference_t<T>>, ResultError>) {
      errno_ = t.code();
      return (*this) << t.message();
+12 −8
Original line number Diff line number Diff line
@@ -98,3 +98,7 @@ cc_fuzz {
        "liblog",
    ],
}

vts_config {
    name: "VtsKernelLibdmTest",
}

fs_mgr/libdm/Android.mk

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line
#
# Copyright (C) 2018 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#      http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := VtsKernelLibdmTest
-include test/vts/tools/build/Android.host_config.mk
+3 −0
Original line number Diff line number Diff line
@@ -108,3 +108,6 @@ cc_test {
    defaults: ["liblp_test_defaults"],
}

vts_config {
    name: "VtsKernelLiblpTest",
}
Loading