Added ordering of libraries for Android #33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed issue when build.zip was removed from build cache Fixed local server builds Fixed android builds with no jars
mathiaswking
commented
Mar 21, 2017
| if (extJars.isEmpty()) { | ||
| return null; | ||
| } | ||
|
|
There was a problem hiding this comment.
If building with no jar files
mathiaswking
commented
Mar 21, 2017
| buildEngine(request, response, platform, null); | ||
| return; | ||
| } | ||
|
|
||
| throw new ExtenderException("No SDK version specified."); |
There was a problem hiding this comment.
When building with local server, I kept hitting this exception :)
mathiaswking
commented
Mar 21, 2017
| this.defoldSha1 = defoldSha1; | ||
| this.platform = platform; | ||
| this.runTestClassesDex = runTestClassesDex; | ||
| } |
There was a problem hiding this comment.
Easier to see and debug when each test has version and platform already setup.
mathiaswking
commented
Mar 21, 2017
| File cachedBuild = new File(String.format("build/%s/build.zip", configuration.platform)); | ||
| if (cachedBuild.exists()) | ||
| cachedBuild.delete(); | ||
| assertFalse(cachedBuild.exists()); |
There was a problem hiding this comment.
Beware of cached builds!
mathiaswking
commented
Mar 21, 2017
| @@ -70,6 +70,6 @@ platforms: | |||
| allowedLibs: ["gnustl_static","supc\\+\\+","c","m","m_hard","stdc\\+\\+",] | |||
| allowedFlags: ["-Wa,{{comma_separated_arg}}","-W{{warning}}","-ansi","--ansi","-std-default={{arg}}","-stdlib=(libstdc\\+\\+|libc\\+\\+)","-w","-std=(c89|c99|c\\+\\+0x|c\\+\\+11|c\\+\\+14|c\\+\\+17)","-Wp,{{comma_separated_arg}}","-W{{warning}}","--extra-warnings","--warn-{{warning}}","--warn-={{warning}}","-ferror-limit={{number}}","-O([0-4]?|fast|s|z)"] | |||
| compileCmd: 'arm-linux-androideabi-g++ -c -g -gdwarf-2 -fpic -ffunction-sections -fstack-protector -Wno-psabi -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 -fno-exceptions -funwind-tables --sysroot={{android_sysroot}} -DANDROID -Wa,--noexecstack {{#defines}}-D{{.}} {{/defines}} {{#ext.includes}}-I{{.}} {{/ext.includes}} {{#includes}}-I{{.}} {{/includes}} {{#platformIncludes}}-I{{.}} {{/platformIncludes}} {{src}} -o{{tgt}}' | |||
| linkCmd: 'arm-linux-androideabi-g++ --sysroot={{android_sysroot}} -lEGL -lGLESv1_CM -lGLESv2 {{#src}}{{.}} {{/src}} -o {{tgt}} -Wl,-soname=libdmengine.so {{#defines}}-D{{.}} {{/defines}} -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -landroid -fpic -z text {{#ext.libPaths}}-L{{.}} {{/ext.libPaths}} -Wl,-Bstatic {{#ext.libs}}-l{{.}} {{/ext.libs}} {{#libPaths}}-L{{.}} {{/libPaths}} -Wl,-Bstatic {{#engineLibs}}-l{{.}} {{/engineLibs}} -Wl,-Bdynamic -lOpenSLES -lm -llog -lc -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -shared' | |||
| linkCmd: 'arm-linux-androideabi-g++ --sysroot={{android_sysroot}} -lEGL -lGLESv1_CM -lGLESv2 {{#src}}{{.}} {{/src}} -o {{tgt}} -Wl,-soname=libdmengine.so {{#defines}}-D{{.}} {{/defines}} -Wl,--fix-cortex-a8 -Wl,--no-undefined -Wl,-z,noexecstack -landroid -fpic -z text {{#ext.libPaths}}-L{{.}} {{/ext.libPaths}} -Wl,-Bstatic -Wl,--start-group {{#ext.libs}}-l{{.}} {{/ext.libs}} -Wl,--end-group {{#libPaths}}-L{{.}} {{/libPaths}} -Wl,-Bstatic {{#engineLibs}}-l{{.}} {{/engineLibs}} -Wl,-Bdynamic -lOpenSLES -lm -llog -lc -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -shared' | |||
There was a problem hiding this comment.
Added "-Wl,--start-group" and "-Wl,--end-group" and it actually seemed to work. Did not manage to create a unit test for it though.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed issue when build.zip was removed from build cache
Fixed local server builds
Fixed android builds with no jars