Hacks in opencore in master as part of the recent donut merge

1 view
Skip to first unread message

Jean-Baptiste Queru

unread,
Jul 26, 2009, 5:24:22 PM7/26/09
to android-...@googlegroups.com
As part of the merge of donut into master, I bumped into some
incompatibilities between master's opencore and the code being merged
from donut.

Instead of stopping the entire merge process, I went ahead and hacked
away the few lines that failed to compile. Someone familiar with the
code in question will need to restore the appropriate functionality.

The change that I made is
http://android.git.kernel.org/?p=platform/external/opencore.git;a=blobdiff;f=android/author/android_camera_input.cpp;h=69f0861482c57e1b372e8410f37c1f89262492e9;hp=7131b89b8d5607748364378b25e0f565937a9c56;hb=bafa724e3b515e975ef43d613658808ac572f822;hpb=419084f1ef3f188cdf3ea3e5b13ba8664f32ff59

JBQ

--
Jean-Baptiste M. "JBQ" Queru
Software Engineer, Android Open-Source Project, Google.

Questions sent directly to me that have no reason for being private
will likely get ignored or forwarded to a public forum with no further
warning.

RaviY

unread,
Jul 26, 2009, 7:34:23 PM7/26/09
to android-platform
I have it fixed. I will submit a patch.

-Ravi

On Jul 26, 4:24 pm, Jean-Baptiste Queru <j...@android.com> wrote:
> As part of the merge of donut into master, I bumped into some
> incompatibilities between master's opencore and the code being merged
> from donut.
>
> Instead of stopping the entire merge process, I went ahead and hacked
> away the few lines that failed to compile. Someone familiar with the
> code in question will need to restore the appropriate functionality.
>
> The change that I made ishttp://android.git.kernel.org/?p=platform/external/opencore.git;a=blo...

Jean-Baptiste Queru

unread,
Jul 26, 2009, 8:22:58 PM7/26/09
to android-...@googlegroups.com
Excellent, thanks a lot.

JBQ

RaviY

unread,
Jul 26, 2009, 9:45:12 PM7/26/09
to android-platform

Jean-Baptiste Queru

unread,
Jul 27, 2009, 11:57:22 AM7/27/09
to android-...@googlegroups.com
Thanks for the fix, much appreciated. Sorry for putting you in that situation.

JBQ
Reply all
Reply to author
Forward
0 new messages