diff options
author | Anas Nashif <nashif@linux.intel.com> | 2016-12-05 15:56:26 +0000 |
---|---|---|
committer | Anas Nashif <nashif@linux.intel.com> | 2016-12-05 15:56:26 +0000 |
commit | 70f9244db7de8ad2a404e254b1b242e9ffdc74c5 (patch) | |
tree | 7637828a5f24fee56c9500dc9decca59dffbacc3 /samples/bluetooth | |
parent | 1fbabd4150c389ec6d6971450f740a54466adda7 (diff) | |
parent | 09e6b95adfc63af5744cfd191971aa53fc048fe9 (diff) |
Merge "Merge net branch into master"
Diffstat (limited to 'samples/bluetooth')
-rw-r--r-- | samples/bluetooth/ipsp/src/Makefile | 4 | ||||
-rw-r--r-- | samples/bluetooth/ipsp/testcase.ini | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/samples/bluetooth/ipsp/src/Makefile b/samples/bluetooth/ipsp/src/Makefile index 617ff39f7..8fa7c344f 100644 --- a/samples/bluetooth/ipsp/src/Makefile +++ b/samples/bluetooth/ipsp/src/Makefile @@ -1,7 +1,3 @@ -ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki -ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os/lib -ccflags-y +=-I${ZEPHYR_BASE}/net/ip/contiki/os -ccflags-y +=-I${ZEPHYR_BASE}/net/ip ccflags-y +=-I${ZEPHYR_BASE}/samples/bluetooth obj-y = main.o ../../gatt/ipss.o diff --git a/samples/bluetooth/ipsp/testcase.ini b/samples/bluetooth/ipsp/testcase.ini index 64b66bf18..d2d5a4102 100644 --- a/samples/bluetooth/ipsp/testcase.ini +++ b/samples/bluetooth/ipsp/testcase.ini @@ -2,3 +2,4 @@ tags = bluetooth net build_only = true platform_whitelist = qemu_x86 qemu_cortex_m3 +skip = true |