All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] can-utils: AOSP build clean up
@ 2013-07-10  7:28 yegorslists
  2013-07-10  9:05 ` Marc Kleine-Budde
  0 siblings, 1 reply; 2+ messages in thread
From: yegorslists @ 2013-07-10  7:28 UTC (permalink / raw)
  To: linux-can; +Cc: Yegor Yefremov

From: Yegor Yefremov <yegorslists@googlemail.com>

Remove unneeded includes. Both AOSP and NDK builds tested.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 Android.mk |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/Android.mk b/Android.mk
index 4cf664b..ffac957 100755
--- a/Android.mk
+++ b/Android.mk
@@ -13,7 +13,7 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := lib.c
 LOCAL_MODULE := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_STATIC_LIBRARY)
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES := candump.c
 LOCAL_MODULE := candump
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -43,7 +43,7 @@ LOCAL_SRC_FILES := cansend.c
 LOCAL_MODULE := cansend
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -57,7 +57,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := bcmserver.c
 LOCAL_MODULE := bcmserver
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -72,7 +72,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := can-calc-bit-timing.c
 LOCAL_MODULE := can-calc-bit-timing
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -86,7 +86,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := canbusload.c
 LOCAL_MODULE := canbusload
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -100,7 +100,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := canfdtest.c
 LOCAL_MODULE := canfdtest
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -115,7 +115,7 @@ LOCAL_SRC_FILES := cangen.c
 LOCAL_MODULE := cangen
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -129,7 +129,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := cangw.c
 LOCAL_MODULE := cangw
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -144,7 +144,7 @@ LOCAL_SRC_FILES := canlogserver.c
 LOCAL_MODULE := canlogserver
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -159,7 +159,7 @@ LOCAL_SRC_FILES := canplayer.c
 LOCAL_MODULE := canplayer
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -173,7 +173,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := cansniffer.c
 LOCAL_MODULE := cansniffer
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -187,7 +187,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotpdump.c
 LOCAL_MODULE := isotpdump
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -201,7 +201,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotprecv.c
 LOCAL_MODULE := isotprecv
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -215,7 +215,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotpsend.c
 LOCAL_MODULE := isotpsend
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -229,7 +229,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotpserver.c
 LOCAL_MODULE := isotpserver
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -243,7 +243,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotpsniffer.c
 LOCAL_MODULE := isotpsniffer.c
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -257,7 +257,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := isotptun.c
 LOCAL_MODULE := isotptun
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -272,7 +272,7 @@ LOCAL_SRC_FILES := log2asc.c
 LOCAL_MODULE := log2asc
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -287,7 +287,7 @@ LOCAL_SRC_FILES := log2long.c
 LOCAL_MODULE := log2long
 LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libcan
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -301,7 +301,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := slcan_attach.c
 LOCAL_MODULE := slcan_attach
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -315,7 +315,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := slcand.c
 LOCAL_MODULE := slcand
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
@@ -329,7 +329,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := slcanpty.c
 LOCAL_MODULE := slcanpty
 LOCAL_MODULE_TAGS := optional
-LOCAL_C_INCLUDES := $(KERNEL_HEADERS) $(LOCAL_PATH)/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
-- 
1.7.7


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] can-utils: AOSP build clean up
  2013-07-10  7:28 [PATCH] can-utils: AOSP build clean up yegorslists
@ 2013-07-10  9:05 ` Marc Kleine-Budde
  0 siblings, 0 replies; 2+ messages in thread
From: Marc Kleine-Budde @ 2013-07-10  9:05 UTC (permalink / raw)
  To: yegorslists; +Cc: linux-can

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

On 07/10/2013 09:28 AM, yegorslists@googlemail.com wrote:
> From: Yegor Yefremov <yegorslists@googlemail.com>
> 
> Remove unneeded includes. Both AOSP and NDK builds tested.
> 
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

Looks good, pushed to master.

tnx,
Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 259 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-10  9:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-10  7:28 [PATCH] can-utils: AOSP build clean up yegorslists
2013-07-10  9:05 ` Marc Kleine-Budde

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.