aboutsummaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk22
1 files changed, 9 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk
index bfe725fc..fa3a9c39 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,9 +29,6 @@ include $(CLEAR_VARS)
# libadsprpc is converted as blueprint targets can't depend on targets exposed
# by makefiles
LOCAL_MODULE := chre
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
LOCAL_MODULE_OWNER := google
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
@@ -53,14 +50,10 @@ endif
CHRE_USE_TOKENIZED_LOGGING := false
LOCAL_SRC_FILES := \
- host/common/daemon_base.cc \
host/common/fragmented_load_transaction.cc \
host/common/host_protocol_host.cc \
- host/common/log_message_parser_base.cc \
host/common/socket_server.cc \
- host/common/st_hal_lpma_handler.cc \
- host/msm/daemon/fastrpc_daemon.cc \
- host/msm/daemon/main.cc \
+ host/msm/daemon/chre_daemon.cc \
host/msm/daemon/generated/chre_slpi_stub.c \
platform/shared/host_protocol_common.cc
@@ -72,9 +65,9 @@ LOCAL_C_INCLUDES := \
system/chre/platform/shared/include \
system/chre/platform/slpi/include \
system/chre/util/include \
- system/libbase/include \
+ system/core/base/include \
system/core/libcutils/include \
- system/logging/liblog/include \
+ system/core/liblog/include \
system/core/libutils/include \
LOCAL_SHARED_LIBRARIES := \
@@ -83,9 +76,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
liblog \
libhidlbase \
- libbase \
- android.hardware.soundtrigger@2.0 \
- libpower
+ libbase
# Enable tokenized logging
ifeq ($(CHRE_USE_TOKENIZED_LOGGING),true)
@@ -105,6 +96,11 @@ LOCAL_SRC_FILES += $(PIGWEED_TOKENIZER_DIR_RELPATH)/pw_tokenizer/decode.cc
LOCAL_SRC_FILES += $(PIGWEED_TOKENIZER_DIR_RELPATH)/pw_varint/varint.cc
endif
+ifeq ($(CHRE_DAEMON_LPMA_ENABLED),true)
+LOCAL_SHARED_LIBRARIES += android.hardware.soundtrigger@2.0
+LOCAL_SHARED_LIBRARIES += libpower
+endif
+
ifeq ($(CHRE_DAEMON_USE_SDSPRPC),true)
LOCAL_SHARED_LIBRARIES += libsdsprpc
else