diff options
Diffstat (limited to 'platform/platform.mk')
| -rw-r--r-- | platform/platform.mk | 89 |
1 files changed, 22 insertions, 67 deletions
diff --git a/platform/platform.mk b/platform/platform.mk index 29e52253..10d317c6 100644 --- a/platform/platform.mk +++ b/platform/platform.mk @@ -33,6 +33,14 @@ SLPI_CFLAGS += -Iplatform/slpi/include # We use FlatBuffers in the SLPI platform layer SLPI_CFLAGS += $(FLATBUFFERS_CFLAGS) +ifneq ($(CHRE_ENABLE_ACCEL_CAL), false) +SLPI_CFLAGS += -DCHRE_ENABLE_ACCEL_CAL +endif + +ifneq ($(CHRE_ENABLE_ASH_DEBUG_DUMP), false) +SLPI_CFLAGS += -DCHRE_ENABLE_ASH_DEBUG_DUMP +endif + # SLPI/SEE-specific Compiler Flags ############################################# # Include paths. @@ -61,57 +69,29 @@ ifeq ($(IMPORT_CHRE_UTILS), true) SLPI_SEE_CFLAGS += -DIMPORT_CHRE_UTILS endif -# Enable accel calibration and ASH debug dump by default unless overridden -# explicitly by the environment. -ifneq ($(CHRE_ENABLE_ACCEL_CAL), false) -SLPI_SEE_CFLAGS += -DCHRE_ENABLE_ACCEL_CAL -endif - -ifneq ($(CHRE_ENABLE_ASH_DEBUG_DUMP), false) -SLPI_SEE_CFLAGS += -DCHRE_ENABLE_ASH_DEBUG_DUMP -endif - -# SLPI/QSH-specific Compiler Flags ############################################# - -# Include paths. -SLPI_QSH_CFLAGS += -I$(SLPI_PREFIX)/config/cust -SLPI_QSH_CFLAGS += -I$(SLPI_PREFIX)/qsh/qsh_nanoapp/inc -SLPI_QSH_CFLAGS += -Iplatform/slpi/see/include - -ifeq ($(CHRE_USE_BUFFERED_LOGGING), true) -SLPI_QSH_CFLAGS += -DCHRE_USE_BUFFERED_LOGGING -endif - -# Define CHRE_SLPI_SEE for the few components that are still shared between QSH -# and SEE. -SLPI_QSH_CFLAGS += -DCHRE_SLPI_SEE - # SLPI-specific Source Files ################################################### -SLPI_SRCS += platform/shared/assert.cc SLPI_SRCS += platform/shared/chre_api_audio.cc SLPI_SRCS += platform/shared/chre_api_core.cc SLPI_SRCS += platform/shared/chre_api_gnss.cc SLPI_SRCS += platform/shared/chre_api_re.cc -SLPI_SRCS += platform/shared/chre_api_user_settings.cc +SLPI_SRCS += platform/shared/chre_api_sensor.cc SLPI_SRCS += platform/shared/chre_api_version.cc SLPI_SRCS += platform/shared/chre_api_wifi.cc SLPI_SRCS += platform/shared/chre_api_wwan.cc SLPI_SRCS += platform/shared/host_protocol_chre.cc SLPI_SRCS += platform/shared/host_protocol_common.cc SLPI_SRCS += platform/shared/memory_manager.cc -SLPI_SRCS += platform/shared/nanoapp_load_manager.cc SLPI_SRCS += platform/shared/nanoapp/nanoapp_dso_util.cc SLPI_SRCS += platform/shared/pal_system_api.cc -SLPI_SRCS += platform/shared/pw_tokenized_log.cc SLPI_SRCS += platform/shared/system_time.cc -SLPI_SRCS += platform/shared/version.cc SLPI_SRCS += platform/slpi/chre_api_re.cc SLPI_SRCS += platform/slpi/fatal_error.cc SLPI_SRCS += platform/slpi/host_link.cc SLPI_SRCS += platform/slpi/init.cc SLPI_SRCS += platform/slpi/memory.cc SLPI_SRCS += platform/slpi/memory_manager.cc +SLPI_SRCS += platform/slpi/nanoapp_load_manager.cc SLPI_SRCS += platform/slpi/platform_debug_dump_manager.cc SLPI_SRCS += platform/slpi/platform_nanoapp.cc SLPI_SRCS += platform/slpi/platform_pal.cc @@ -142,16 +122,16 @@ endif # SLPI/SEE-specific Source Files ############################################### -# Optional sensors support. -ifeq ($(CHRE_SENSORS_SUPPORT_ENABLED), true) SLPI_SEE_SRCS += platform/slpi/see/platform_sensor.cc SLPI_SEE_SRCS += platform/slpi/see/platform_sensor_manager.cc +SLPI_SEE_SRCS += platform/slpi/see/power_control_manager.cc + ifneq ($(IMPORT_CHRE_UTILS), true) +SLPI_SEE_SRCS += platform/slpi/see/island_vote_client.cc SLPI_SEE_SRCS += platform/slpi/see/see_cal_helper.cc SLPI_SEE_SRCS += platform/slpi/see/see_helper.cc endif -SLPI_SEE_SRCS += platform/shared/chre_api_sensor.cc SLPI_SEE_SRCS += $(SLPI_PREFIX)/ssc_api/pb/sns_client.pb.c SLPI_SEE_SRCS += $(SLPI_PREFIX)/ssc_api/pb/sns_suid.pb.c SLPI_SEE_SRCS += $(SLPI_PREFIX)/ssc_api/pb/sns_cal.pb.c @@ -165,26 +145,6 @@ SLPI_SEE_SRCS += $(SLPI_PREFIX)/ssc_api/pb/sns_std_type.pb.c SLPI_SEE_QSK_SRCS += $(SLPI_PREFIX)/chre/chre/src/system/chre/platform/slpi/sns_qmi_client_alt.c SLPI_SEE_QMI_SRCS += $(SLPI_PREFIX)/chre/chre/src/system/chre/platform/slpi/sns_qmi_client.c -endif - -SLPI_SEE_SRCS += platform/slpi/see/power_control_manager.cc - -ifneq ($(IMPORT_CHRE_UTILS), true) -SLPI_SEE_SRCS += platform/slpi/see/island_vote_client.cc -endif - -# SLPI/QSH-specific Source Files ############################################### - -SLPI_QSH_SRCS += platform/slpi/see/island_vote_client.cc -SLPI_QSH_SRCS += platform/slpi/see/power_control_manager.cc -SLPI_QSH_SRCS += platform/slpi/qsh/qsh_shim.cc - -ifeq ($(CHRE_USE_BUFFERED_LOGGING), true) -SLPI_QSH_SRCS += platform/shared/log_buffer.cc -SLPI_QSH_SRCS += platform/shared/log_buffer_manager.cc -SLPI_QSH_SRCS += platform/slpi/log_buffer_manager.cc -endif - # Simulator-specific Compiler Flags ############################################ @@ -213,7 +173,6 @@ SIM_SRCS += platform/shared/chre_api_core.cc SIM_SRCS += platform/shared/chre_api_gnss.cc SIM_SRCS += platform/shared/chre_api_re.cc SIM_SRCS += platform/shared/chre_api_sensor.cc -SIM_SRCS += platform/shared/chre_api_user_settings.cc SIM_SRCS += platform/shared/chre_api_version.cc SIM_SRCS += platform/shared/chre_api_wifi.cc SIM_SRCS += platform/shared/chre_api_wwan.cc @@ -223,23 +182,22 @@ SIM_SRCS += platform/shared/pal_sensor_stub.cc SIM_SRCS += platform/shared/pal_system_api.cc SIM_SRCS += platform/shared/platform_sensor_manager.cc SIM_SRCS += platform/shared/system_time.cc -SIM_SRCS += platform/shared/version.cc # Optional GNSS support. ifeq ($(CHRE_GNSS_SUPPORT_ENABLED), true) -SIM_SRCS += platform/linux/pal_gnss.cc +SIM_SRCS += platform/shared/pal_gnss_stub.cc SIM_SRCS += platform/shared/platform_gnss.cc endif # Optional Wi-Fi support. ifeq ($(CHRE_WIFI_SUPPORT_ENABLED), true) -SIM_SRCS += platform/linux/pal_wifi.cc +SIM_SRCS += platform/shared/pal_wifi_stub.cc SIM_SRCS += platform/shared/platform_wifi.cc endif # Optional WWAN support. ifeq ($(CHRE_WWAN_SUPPORT_ENABLED), true) -SIM_SRCS += platform/linux/pal_wwan.cc +SIM_SRCS += platform/shared/pal_wwan_stub.cc SIM_SRCS += platform/shared/platform_wwan.cc endif @@ -250,7 +208,6 @@ GOOGLE_X86_LINUX_CFLAGS += -Iplatform/linux/include # Linux-specific Source Files ################################################## GOOGLE_X86_LINUX_SRCS += platform/linux/init.cc -GOOGLE_X86_LINUX_SRCS += platform/linux/assert.cc # Optional audio support. ifeq ($(CHRE_AUDIO_SUPPORT_ENABLED), true) @@ -265,10 +222,10 @@ GOOGLE_ARM64_ANDROID_CFLAGS += -Iplatform/android/include # Add in host sources to allow the executable to both be a socket server and # CHRE implementation. -GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/libbase/include +GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/core/base/include GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/core/libcutils/include GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/core/libutils/include -GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/logging/liblog/include +GOOGLE_ARM64_ANDROID_CFLAGS += -I$(ANDROID_BUILD_TOP)/system/core/liblog/include GOOGLE_ARM64_ANDROID_CFLAGS += -Ihost/common/include # Also add the linux sources to fall back to the default Linux implementation. @@ -280,7 +237,7 @@ GOOGLE_ARM64_ANDROID_CFLAGS += -I$(FLATBUFFERS_PATH)/include # Android-specific Source Files ################################################ ANDROID_CUTILS_TOP = $(ANDROID_BUILD_TOP)/system/core/libcutils -ANDROID_LOG_TOP = $(ANDROID_BUILD_TOP)/system/logging/liblog +ANDROID_LOG_TOP = $(ANDROID_BUILD_TOP)/system/core/liblog GOOGLE_ARM64_ANDROID_SRCS += $(ANDROID_CUTILS_TOP)/sockets_unix.cpp GOOGLE_ARM64_ANDROID_SRCS += $(ANDROID_CUTILS_TOP)/android_get_control_file.cpp @@ -309,8 +266,6 @@ GOOGLETEST_CFLAGS += -Iplatform/slpi/include # GoogleTest Source Files ###################################################### -GOOGLETEST_COMMON_SRCS += platform/linux/assert.cc -GOOGLETEST_COMMON_SRCS += platform/linux/audio_source.cc -GOOGLETEST_COMMON_SRCS += platform/linux/platform_audio.cc -GOOGLETEST_COMMON_SRCS += platform/tests/log_buffer_test.cc -GOOGLETEST_COMMON_SRCS += platform/shared/log_buffer.cc +GOOGLETEST_SRCS += platform/linux/assert.cc +GOOGLETEST_SRCS += platform/linux/audio_source.cc +GOOGLETEST_SRCS += platform/linux/platform_audio.cc |