summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-29 04:01:53 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-01-29 04:01:53 +0000
commita0f47b55b5bab630f5d202df022d269750be98fb (patch)
tree75cf19c94f1b68eb875ab7db62526dacdb04d0ca
parentedea12b2e43f9ef728a060be8ef5ce3b685ee11c (diff)
parentf0584f4b7c15d3e92d5d9bebf184bb44739e88b9 (diff)
downloadcontexthub-a0f47b55b5bab630f5d202df022d269750be98fb.tar.gz
Snap for 8130893 from f0584f4b7c15d3e92d5d9bebf184bb44739e88b9 to tm-release
Change-Id: Iaeb63f7edd793d460893752416d3bdf91c076530
-rw-r--r--firmware/chre/platform/assert.h25
-rw-r--r--firmware/firmware.mk1
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