diff options
| author | Andrew Rossignol <aarossig@google.com> | 2017-02-28 17:12:58 -0800 |
|---|---|---|
| committer | Brian Duddie <bduddie@google.com> | 2017-03-03 16:34:36 -0800 |
| commit | 388d81b80425f66acb306c774e46d53221d36b33 (patch) | |
| tree | 4935b15ebb440c9e1048a6388987208c4140a47d /Makefile | |
| parent | 3e7aa59e607be3b5bd0c710bc2f5762770eee395 (diff) | |
| download | chre-388d81b80425f66acb306c774e46d53221d36b33.tar.gz | |
Adds support for Makefile Linux and GoogleTest builds
- gtest runs, but no tests are registered yet
- Linux runs successfully
- The next step is to migrate tests to run with gtest and remove BUILD
files
Change-Id: I94606074f8aea1f3b1a164227efbe3184b02b2a7
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -15,13 +15,13 @@ CHRE_PREFIX = . ifeq ($(HEXAGON_SDK_PREFIX),) $(error "You must supply a HEXAGON_SDK_PREFIX environment variable \ containing a path to the hexagon SDK. Example: \ - $$HOME/Qualcomm/Hexagon_SDK/3.0") + export HEXAGON_SDK_PREFIX=$$HOME/Qualcomm/Hexagon_SDK/3.0") endif ifeq ($(SLPI_PREFIX),) -$(error "You must supply an SLPI_PREFIX environemnt variable \ +$(error "You must supply an SLPI_PREFIX environment variable \ containing a path to the SLPI source tree. Example: \ - $$HOME/slpi_proc") + export SLPI_PREFIX=$$HOME/slpi_proc") endif # Build Configuration ########################################################## @@ -56,6 +56,7 @@ include apps/sensor_world/sensor_world.mk include apps/timer_world/timer_world.mk include chre_api/chre_api.mk include core/core.mk +include external/external.mk include pal/pal.mk include platform/platform.mk include util/util.mk @@ -69,3 +70,4 @@ include build/common.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv60_slpi.mk include $(CHRE_PREFIX)/build/variant/google_hexagonv62_slpi.mk include $(CHRE_PREFIX)/build/variant/google_x86_linux.mk +include $(CHRE_PREFIX)/build/variant/google_x86_googletest.mk |