Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(516)

Issue 420353002: GN: Specify correct prefix/postfix libs for solink on android (Closed)

Created:
6 years, 4 months ago by jamesr
Modified:
6 years, 4 months ago
Reviewers:
brettw
CC:
chromium-reviews, cjhopman
Project:
chromium
Visibility:
Public.

Description

GN: Specify correct prefix/postfix libs for solink on android On android we have to specify crtbegin_dynamic.o / crtend_android.o when linking executables and crtbegin_so.o / crtend_so.o when linking shared libraries. This splits the variables up in gcc_toolchain so the android template can differentiate between the two. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285991

Patch Set 1 #

Total comments: 1

Patch Set 2 : #

Total comments: 1
Unified diffs Side-by-side diffs Delta from patch set Stats (+19 lines, -1 line) Patch
M build/toolchain/android/BUILD.gn View 1 chunk +3 lines, -0 lines 0 comments Download
M build/toolchain/gcc_toolchain.gni View 1 3 chunks +16 lines, -1 line 1 comment Download

Messages

Total messages: 8 (0 generated)
jamesr
https://codereview.chromium.org/420353002/diff/1/build/toolchain/gcc_toolchain.gni File build/toolchain/gcc_toolchain.gni (right): https://codereview.chromium.org/420353002/diff/1/build/toolchain/gcc_toolchain.gni#newcode100 build/toolchain/gcc_toolchain.gni:100: command = "if [ ! -e \$lib -o ! ...
6 years, 4 months ago (2014-07-28 19:34:46 UTC) #1
jamesr
OK, this seems to work (I still don't understand the bash conditional here but this ...
6 years, 4 months ago (2014-07-28 20:38:23 UTC) #2
brettw
lgtm
6 years, 4 months ago (2014-07-28 20:55:43 UTC) #3
jamesr
The CQ bit was checked by jamesr@chromium.org
6 years, 4 months ago (2014-07-28 20:58:02 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/jamesr@chromium.org/420353002/20001
6 years, 4 months ago (2014-07-28 20:59:31 UTC) #5
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: ios_rel_device_ninja on tryserver.chromium.mac ...
6 years, 4 months ago (2014-07-28 21:56:46 UTC) #6
commit-bot: I haz the power
Change committed as 285991
6 years, 4 months ago (2014-07-28 22:03:13 UTC) #7
jamesr
6 years, 4 months ago (2014-07-29 02:13:26 UTC) #8
Message was sent while issue was closed.
https://codereview.chromium.org/420353002/diff/20001/build/toolchain/gcc_tool...
File build/toolchain/gcc_toolchain.gni (right):

https://codereview.chromium.org/420353002/diff/20001/build/toolchain/gcc_tool...
build/toolchain/gcc_toolchain.gni:100: command = "if [ ! -e \$lib -o ! -e
\${lib}.TOC ]; then $ld -shared \$ldflags -o \$lib -Wl,-soname=\$soname
@\$rspfile && { readelf -d \${lib} | grep SONAME ; nm -gD -f p \${lib} | cut
-f1-2 -d' '; } > \${lib}.TOC; else $ld -shared \$ldflags -o \$lib
-Wl,-soname=\$soname -Wl,--whole-archive \$in \$solibs -Wl,--no-whole-archive
$solink_libs_section_prefix \$libs $solink_libs_section_postfix && { readelf -d
\${lib} | grep SONAME ; nm -gD -f p \${lib} | cut -f1-2 -d' '; } > \${lib}.tmp
&& if ! cmp -s \${lib}.tmp \${lib}.TOC; then mv \${lib}.tmp \${lib}.TOC ; fi;
fi"
d'oh, I flubbed this and since I didn't realize the branch was about recompiling
didn't catch it when doing local incremental builds.  I'll post a patch to fix
but maybe cjhopman@ will land his better fix to remove this bash conditional
first

Powered by Google App Engine
This is Rietveld 408576698