ubuntu-phone team mailing list archive

[Marcel Partap <mpartap@xxxxxxx>]

Hi guys,
trying to port this to the samsung i927 (captivate glide), I ran into
this compilation issue:
> hardware/samsung/ril/xmm6260/libril/ril.cpp: In function 'void android::issueLocalRequest(int, void*, int)':
> hardware/samsung/ril/xmm6260/libril/ril.cpp:343:62: error: 'RLOGD' was not declared in this scope
> hardware/samsung/ril/xmm6260/libril/ril.cpp:358:50: error: 'RLOGD' was not declared in this scope
> hardware/samsung/ril/xmm6260/libril/ril.cpp: In function 'int android::processCommandBuffer(void*, size_t)':
> hardware/samsung/ril/xmm6260/libril/ril.cpp:380:38: error: 'RLOGE' was not declared in this scope
> hardware/samsung/ril/xmm6260/libril/ril.cpp:388:69: error: 'RLOGE' was not declared in this scope
> hardware/samsung/ril/xmm6260/libril/ril.cpp:401:31: error: 'RLOGD' was not declared in this scope

...
It seems to be caused by the two repos' APIs being out of sync:
>  commit ba5c6a3ca1fcdfc56b25962a266f9d3da46db60e
>  Author: XpLoDWilD <xplodwild@xxxxxxxxxxxxxxx>
>  Date:   Sat Jul 27 21:12:19 2013 +0200
>  
>      xmm6262: Update to new RIL version
>      
>      Change-Id: I10b3d90861f5332e17ec19985efb83f8d10ae05c
>  ---
>   ril/xmm6262/libril/Android.mk           |   1 +
>   ril/xmm6262/libril/ril.cpp              | 385 +++++++++++++---------
>   ril/xmm6262/libril/ril_commands.h       |   2 +
>   ril/xmm6262/libril/ril_event.cpp        |   4 +-
>   ril/xmm6262/libril/ril_unsol_commands.h |   1 +
(repo android_hardware_samsung)

while the frameworks/native/include/utils/Log.h is still at an "ancient"
commit:
> # git log include/utils/Log.h
>  commit 6f12d573251528086636707dde2fb01a8b7199b8
>  Author: Jeff Brown <jeffbrown@xxxxxxxxxx>
>  Date:   Fri Aug 10 20:44:39 2012 -0700
(repo android_frameworks_native)

How to proceed to clear this up?
#Regards!Marcel
P.S: go0gl shows that at least one other person has run into this, three
weeks ago: http://pastebin.com/tBCeedH9