diff options
| author | Nick Vaccaro | 2016-10-24 15:52:17 -0500 |
|---|---|---|
| committer | Nick Vaccaro | 2016-10-24 16:07:35 -0500 |
| commit | e204690ae7521726711b3b16f29c5e52a980ebb3 (patch) | |
| tree | 38e4fe79f1702802613795c8b3061967d5751133 /healthd/Android.mk | |
| parent | 5115f1c77a51837776ab52a8e86d2583081ba17a (diff) | |
| parent | 7c5aeb0f0ae44b02c3abc72e1daa4151940e1937 (diff) | |
| download | platform-system-core-e204690ae7521726711b3b16f29c5e52a980ebb3.tar.gz platform-system-core-e204690ae7521726711b3b16f29c5e52a980ebb3.tar.xz platform-system-core-e204690ae7521726711b3b16f29c5e52a980ebb3.zip | |
resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp
Test: make healthd
Change-Id: I6dd20f5da5d2a9858d49db5556d8956a67ebf962
Diffstat (limited to 'healthd/Android.mk')
| -rw-r--r-- | healthd/Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/healthd/Android.mk b/healthd/Android.mk index 7c5e35bac..1c130dc1b 100644 --- a/healthd/Android.mk +++ b/healthd/Android.mk | |||
| @@ -90,6 +90,14 @@ endif | |||
| 90 | 90 | ||
| 91 | LOCAL_C_INCLUDES := bootable/recovery $(LOCAL_PATH)/include | 91 | LOCAL_C_INCLUDES := bootable/recovery $(LOCAL_PATH)/include |
| 92 | 92 | ||
| 93 | ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_FAST),) | ||
| 94 | LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_FAST=$(BOARD_PERIODIC_CHORES_INTERVAL_FAST) | ||
| 95 | endif | ||
| 96 | |||
| 97 | ifneq ($(BOARD_PERIODIC_CHORES_INTERVAL_SLOW),) | ||
| 98 | LOCAL_CFLAGS += -DBOARD_PERIODIC_CHORES_INTERVAL_SLOW=$(BOARD_PERIODIC_CHORES_INTERVAL_SLOW) | ||
| 99 | endif | ||
| 100 | |||
| 93 | LOCAL_STATIC_LIBRARIES := \ | 101 | LOCAL_STATIC_LIBRARIES := \ |
| 94 | libhealthd_internal \ | 102 | libhealthd_internal \ |
| 95 | libbatterymonitor \ | 103 | libbatterymonitor \ |