diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-15 04:02:17 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-02-15 04:02:17 +0000 |
| commit | b13c7722064974756d8b4f5297e7f0b053e3dfc5 (patch) | |
| tree | 75cf19c94f1b68eb875ab7db62526dacdb04d0ca | |
| parent | 333a7eb3d9f64415432e4c2f7ef0fc0ad470d79a (diff) | |
| parent | fe490db9e8f8dde6edc527664efb4a1cf6c328b9 (diff) | |
| download | contexthub-b13c7722064974756d8b4f5297e7f0b053e3dfc5.tar.gz | |
Snap for 8183730 from fe490db9e8f8dde6edc527664efb4a1cf6c328b9 to udc-release
Change-Id: If4327942ee3590fcaef78ab6f96090f9aaf7d53a
| -rw-r--r-- | firmware/build/common_config.mk | 1 | ||||
| -rw-r--r-- | firmware/chre/platform/assert.h | 25 | ||||
| -rw-r--r-- | firmware/firmware.mk | 1 | ||||
| -rw-r--r-- | firmware/firmware_conf.mk | 1 |
4 files changed, 28 insertions, 0 deletions
diff --git a/firmware/build/common_config.mk b/firmware/build/common_config.mk index 990db3c4..189d71d3 100644 --- a/firmware/build/common_config.mk +++ b/firmware/build/common_config.mk @@ -71,6 +71,7 @@ LOCAL_CFLAGS_stm32 += \ # CHRE-specific LOCAL_CFLAGS += \ -DCHRE_MESSAGE_TO_HOST_MAX_SIZE=128 \ + -DCHRE_NANOAPP_SUPPORTS_PRE_V1_5 \ -DCHRE_NO_DOUBLE_SUPPORT \ # DEBUG/RELEASE-specific 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 diff --git a/firmware/firmware_conf.mk b/firmware/firmware_conf.mk index 7ea3f612..f6da08f4 100644 --- a/firmware/firmware_conf.mk +++ b/firmware/firmware_conf.mk @@ -17,5 +17,6 @@ # parameters common for OS and APPs COMMON_FLAGS += \ -DCHRE_MESSAGE_TO_HOST_MAX_SIZE=128 \ + -DCHRE_NANOAPP_SUPPORTS_PRE_V1_5 \ -DCHRE_NO_DOUBLE_SUPPORT \ |