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

Commit 358dd11b authored by Jack He's avatar Jack He
Browse files

Replace assert with CHECK from base/logging.h

* Replace assert with CHECK
* Remove all NDEBUG definitions
* Remove hacks for BT_LIBCHROME_NDEBUG
* Removed some removed directories from Makefile such as hcis, brcm, rpc

Coccinelle-assisted:

@@
@@

- #include "base/logging.h"
+ #include <base/logging.h>

@ assert_included @
@@

@ base_logging_included @
@@

@ depends on (assert_included && !(base_logging_included)) @
@@

- #include <assert.h>
+ #include <base/logging.h>

@ depends on (assert_included && base_logging_included) @
@@

- #include <assert.h>

@@
expression E;
@@

- assert(E);
+ CHECK(E);

And a bash script:

for file in $(find . -name "*.cc"); do
  spatch --sp-file replace_assert_with_CHECK.cocci --in-place $file
done

The following files are maually edited:
	btif/src/btif_config.cc
	btif/src/btif_avrcp_audio_track.cc
	btif/src/btif_gatt_client.cc
	osi/src/data_dispatcher.cc
	osi/src/reactor.cc
	osi/src/thread.cc
	osi/src/fixed_queue.cc
	osi/src/list.cc
	osi/src/allocation_tracker.cc
	osi/src/alarm.cc
	osi/test/wakelock_test.cc

Bug: 31781465
Test: Code compilation, Unit Tests, BtStressTest, BtFunhausMetricsTest
Change-Id: I21dc10a45be31665e41441b75b0515ed87523988
parent 56f33628
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment