diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2016-05-23 10:36:54 -0700 |
|---|---|---|
| committer | Bertrand SIMONNET <bsimonnet@google.com> | 2016-05-23 13:02:34 -0700 |
| commit | a1c75fef47384d6eb80043248dd6a6117c843871 (patch) | |
| tree | 5793d301aee772851394bb99869e3aad52e0b535 | |
| parent | 4efbbe5718e9a554b66de7900ca6facfe28bfe42 (diff) | |
| download | peripheralmanager-a1c75fef47384d6eb80043248dd6a6117c843871.tar.gz | |
Change peripheralman tests to run on the device.
The daemon tests were created as host tests. We actually don't run host
tests in the builder so convert them to native tests to be able to run
it.
Bug: 28909367
Change-Id: I24ffdf1363fc202a661b417debaac594784a0fcd
| -rw-r--r-- | daemon/Android.mk | 33 | ||||
| -rw-r--r-- | hal/Android.mk | 5 |
2 files changed, 2 insertions, 36 deletions
diff --git a/daemon/Android.mk b/daemon/Android.mk index d6a12eb..6e8c6ed 100644 --- a/daemon/Android.mk +++ b/daemon/Android.mk @@ -116,37 +116,8 @@ LOCAL_SRC_FILES := $(libperipheralman_internal_CommonSources) \ include $(BUILD_STATIC_LIBRARY) -# peripheralman internals library for host tests +# peripheralman unit tests # ======================================================== - -include $(CLEAR_VARS) -LOCAL_MODULE := libperipheralman_internal -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS := $(peripheralman_CommonCFlags) -LOCAL_C_INCLUDES := $(peripheralman_CommonCIncludes) -LOCAL_SHARED_LIBRARIES := \ - libchrome \ - -LOCAL_STATIC_LIBRARIES := \ - peripheral_manager_hal_headers \ - -LOCAL_SRC_FILES := \ - char_device.cc \ - gpio_driver_sysfs.cc \ - gpio_manager.cc \ - i2c_driver_i2cdev.cc \ - i2c_manager.cc \ - led_driver_sysfs.cc \ - led_manager.cc \ - pin_mux_manager.cc \ - spi_driver_spidev.cc \ - spi_manager.cc \ - -include $(BUILD_HOST_STATIC_LIBRARY) - -# peripheralman host unit tests -# ======================================================== - include $(CLEAR_VARS) LOCAL_MODULE := peripheralman_unittests LOCAL_CPP_EXTENSION := .cc @@ -165,4 +136,4 @@ LOCAL_SRC_FILES := \ pin_mux_manager_unittest.cc \ spi_manager_unittest.cc \ -include $(BUILD_HOST_NATIVE_TEST) +include $(BUILD_NATIVE_TEST) diff --git a/hal/Android.mk b/hal/Android.mk index fa3b2cb..9e0d4e1 100644 --- a/hal/Android.mk +++ b/hal/Android.mk @@ -20,8 +20,3 @@ include $(CLEAR_VARS) LOCAL_MODULE := peripheral_manager_hal_headers LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := peripheral_manager_hal_headers -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_HOST_STATIC_LIBRARY) |