<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, 17 Dec 2023 at 13:39, Ralph Versteegen <<a href="mailto:teeemcee@gmail.com">teeemcee@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>That's strange... works on my machine. The error is:</div><div><br></div>
jni/../jni/application/ohrrpgce/tmp//filelayer.cpp:7:24: fatal error: fb/fb_stub.h: No such file or directory<br>
#include "fb/fb_stub.h"<br><div>
^</div><div><br></div><div>And the reason for the error is that copy_source_actions() in ohrbuild.py isn't copying fb/fb_stub.h to android/tmp/ apparently because node.get_implicit_deps(), which is meant to run a sconscript builtin source scanner to return the list of headers isn't working. Try uncommenting the two lines immediately below that:</div><div> def scstr(x): return ",".join(str(y) for y in x)<br> print("node", str(node), "sources", scstr(node.sources), "headers", scstr(headers))</div><div>It should print:</div><div style="margin-left:40px">node filelayer.cpp sources headers errorlog.h,fb/fb_stub.h,filelayer.hpp,lumpfile.h,mutex.hpp,config.h,miscc.h,fb/fb_array.h,fb/fb_config.h,fb/fb_device.h,fb/fb_error.h,fb/fb_file.h,fb/fb_string.h,fb/fb_thread.h,os.h,fb/fb_blackbox_config.h</div><div><br></div><div>As for .aab support... I had a look at upstream commandergenius. They seem to use gradle to create the .aab file, plus have a script for signing it. Gradle isn't used for just that. The addition of all the gradle stuff is new since we forked. I don't know whether you want to copy or reuse the upstream work, requiring gradle, or completely reimplement support some other way.<br></div><div><br></div><div>Trying to merge our fork with upstream commandergenius with "git merge" isn't going to work ("Your branch and 'origin/sdl_android' have diverged, and have 79 and 1915 different commits each, respectively" which doesn't begin to describe the enormous patches and conflicts... I tried git merge after which on the first conflict "git status" outputs 17972 lines and "git diff" 10588 lines of conflicts!). Manually merging it by cherry-picking or applying (some of) our commits on top of upstream might be practical but is still tons of work. Cherry-picking their commits which add .aab support is clearly far less work but isn't easy either,</div></div></blockquote><div><br></div><div>Actually I didn't mean to claim that, it could easily be more work to cherry-picking all their gradle+signing commits than to port our changes upstream. Because at least we understand our own additions and have a hope of reimplementing them in a hairy conflict.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div> because on top of the .aab signing commits (I couldn't easily figure out which commits are needed but "git log --grep bundle" is a good start) you'd also need all the ones for gradle support.<br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, 16 Dec 2023 at 01:49, James Paige via Ohrrpgce <<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>I forgot to mention, the android builds have been broken for a while (Since October 27)</div><div><br></div><div>I haven't had time to narrow it down to the exact revision yet, but I'll work on it when I have time.</div><div>I also want to work on the Android 12 fix, (I know what to do) and the .aab format (Don't know what to do yet, but I'll figure it out eventually)</div><div><br></div><div>---</div><div>James<br></div><div><br></div></div>
_______________________________________________<br>
Ohrrpgce mailing list<br>
<a href="mailto:ohrrpgce@lists.motherhamster.org" target="_blank">ohrrpgce@lists.motherhamster.org</a><br>
<a href="http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org" rel="noreferrer" target="_blank">http://lists.motherhamster.org/listinfo.cgi/ohrrpgce-motherhamster.org</a><br>
</blockquote></div>
</blockquote></div></div>