[PATCH] Android.mk: canbusload: make use of libcan

[PATCH] Android.mk: canbusload: make use of libcan

[Marc Kleine-Budde]

In commit

    2206f92 canbusload: Add exact CAN frame length calculation (including bitstuffing)

the function to calculate the can_frame_length was moved into a seperate file
(canframelen.c). This patch for the Android makefile adds canframelen.c to the
lib, too and lets canbusload link against the lib.

Cc: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hello Yegor,

can you please test if current master + this patch compiles again on Android?

regards,
Marc

 Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index ffac957..1901197 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,7 @@ PRIVATE_LOCAL_CFLAGS := -O2 -g -W -Wall		\
 
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := lib.c
+LOCAL_SRC_FILES := lib.c canframelen.c
 LOCAL_MODULE := libcan
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
@@ -86,6 +86,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := canbusload.c
 LOCAL_MODULE := canbusload
 LOCAL_MODULE_TAGS := optional
+LOCAL_STATIC_LIBRARIES := libcan
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
 LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
 
-- 
1.8.5.3

Re: [PATCH] Android.mk: canbusload: make use of libcan

[Yegor Yefremov]

On Fri, Jan 31, 2014 at 11:25 AM, Marc Kleine-Budde <mkl@pengutronix.de> wrote:
> In commit
>
>     2206f92 canbusload: Add exact CAN frame length calculation (including bitstuffing)
>
> the function to calculate the can_frame_length was moved into a seperate file
> (canframelen.c). This patch for the Android makefile adds canframelen.c to the
> lib, too and lets canbusload link against the lib.
>
> Cc: Yegor Yefremov <yegorslists@googlemail.com>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> Hello Yegor,
>
> can you please test if current master + this patch compiles again on Android?
>
> regards,
> Marc
>
>  Android.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Android.mk b/Android.mk
> index ffac957..1901197 100644
> --- a/Android.mk
> +++ b/Android.mk
> @@ -11,7 +11,7 @@ PRIVATE_LOCAL_CFLAGS := -O2 -g -W -Wall               \
>
>  include $(CLEAR_VARS)
>
> -LOCAL_SRC_FILES := lib.c
> +LOCAL_SRC_FILES := lib.c canframelen.c
>  LOCAL_MODULE := libcan
>  LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
>  LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)
> @@ -86,6 +86,7 @@ include $(CLEAR_VARS)
>  LOCAL_SRC_FILES := canbusload.c
>  LOCAL_MODULE := canbusload
>  LOCAL_MODULE_TAGS := optional
> +LOCAL_STATIC_LIBRARIES := libcan
>  LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/
>  LOCAL_CFLAGS := $(PRIVATE_LOCAL_CFLAGS)

It compiles on Android.

Tested-by: Yegor Yefremov <yegorslists@googlemail.com>

Yegor

Re: [PATCH] Android.mk: canbusload: make use of libcan

[Marc Kleine-Budde]

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

On 01/31/2014 11:47 AM, Yegor Yefremov wrote:
> It compiles on Android.
> 
> Tested-by: Yegor Yefremov <yegorslists@googlemail.com>

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: 242 bytes --]