From 78c7d3a84ee191aadde70ea82a017d29ac9fc82b Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 25 Jan 2022 15:32:57 -0800 Subject: firmware: Fix compilation due to lack of assert.h os/algos/common/math/vec.h:43:38: fatal error: chre/util/nanoapp/assert.h: No such file or directory Bug: 215535680 Test: make -C device/google/contexthub/firmware/variant/neonkey/ Signed-off-by: Dmitry Shmidt Change-Id: Iad91c0a0b0fe3c1b49d86ad9d170fe3215a2ea0f --- firmware/chre/platform/assert.h | 25 +++++++++++++++++++++++++ firmware/firmware.mk | 1 + 2 files changed, 26 insertions(+) create mode 100644 firmware/chre/platform/assert.h diff --git a/firmware/chre/platform/assert.h b/firmware/chre/platform/assert.h new file mode 100644 index 00000000..a2bba24c --- /dev/null +++ b/firmware/chre/platform/assert.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2022 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. + */ + +#ifndef PLATFORM_ASSERT_H_ +#define PLATFORM_ASSERT_H_ + +#include + +#define CHRE_ASSERT ASSERT +#define CHRE_ASSERT_NOT_NULL ASSERT_NOT_NULL + +#endif diff --git a/firmware/firmware.mk b/firmware/firmware.mk index 221ee0cb..c35756a4 100644 --- a/firmware/firmware.mk +++ b/firmware/firmware.mk @@ -57,6 +57,7 @@ FLAGS += -I$(VARIANT_PATH)/inc FLAGS += -Iexternal/freebsd/inc FLAGS += -I../lib/include FLAGS += -I../../../../system/chre/chre_api/include/chre_api +FLAGS += -I../../../../system/chre/util/include FLAGS += -Wall -Werror #help avoid commmon embedded C mistakes -- cgit v1.2.3