diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2022-01-27 20:59:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 20:59:18 +0000 |
| commit | b7bea74b8365f0cb08d200839da3dd5a3c724532 (patch) | |
| tree | 75cf19c94f1b68eb875ab7db62526dacdb04d0ca | |
| parent | d9fe42ff796ede80d2dc4300eed87bc8fa3a9ec1 (diff) | |
| parent | 78c7d3a84ee191aadde70ea82a017d29ac9fc82b (diff) | |
| download | contexthub-b7bea74b8365f0cb08d200839da3dd5a3c724532.tar.gz | |
firmware: Fix compilation due to lack of assert.h am: 78c7d3a84e
Original change: https://android-review.googlesource.com/c/device/google/contexthub/+/1960337
Change-Id: Ib5cead180502ad21318ba5044cbb0a16f633f5ce
| -rw-r--r-- | firmware/chre/platform/assert.h | 25 | ||||
| -rw-r--r-- | firmware/firmware.mk | 1 |
2 files changed, 26 insertions, 0 deletions
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 <util/nano_assert.h> + +#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 |