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

Commit 52efc136 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi
Browse files

Missing "base/notreached.h" 

A libchrome change (on ChromeOS) has removed the "base/notreached.h"
include inside "base/logging.h". Import this header explicitly where
it's used.

Bug: 188832714
Test: atest --host bluetooth_test_gd
Tag: #floss
Change-Id: I1e3360bb7c75450ac4e0179932a6fd5649f2b65e
parent 63fff77b

system/include/notreached.h

0 → 100644
+24 −0
Original line number Diff line number Diff line 
//

//  Copyright 2021 Google, Inc.

//

//  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.

//

#pragma once



// On all old libchrome, NOTREACHED is available via logging.h

// After 822064, this was moved into base/notreached.h

#if defined(BASE_VER) && BASE_VER >= 822064

#include <base/notreached.h>

#else

#include <base/logging.h>

#endif

system/service/adapter.cc

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <base/observer_list.h>



#include "abstract_observer_list.h"

#include "notreached.h"

#include "service/a2dp_sink.h"

#include "service/a2dp_source.h"

#include "service/avrcp_control.h"

system/service/avrcp_control.cc

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <base/memory/ptr_util.h>

#include <base/strings/string_number_conversions.h>



#include "notreached.h"

#include "service/logging_helpers.h"



#include "stack/include/avrc_defs.h"

system/service/client/main.cc

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#include <bluetooth/scan_settings.h>

#include <bluetooth/uuid.h>



#include "notreached.h"



using namespace std;



using android::sp;