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

Issue 953523003: Make combined native/manual JNI registration work for clang. (Closed)

Created:
5 years, 10 months ago by Torne
Modified:
5 years, 10 months ago
Reviewers:
pasko, cjhopman, rmcilroy
CC:
chromium-reviews, erikwright+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Make combined native/manual JNI registration work for clang. Since clang has trouble with aliases for static functions, go back to using a trivial wrapper function instead of an alias. Since there is only one caller of the wrapped, static function, and its address is no longer taken to generate the manual JNI registration table (the wrapper's address is already being taken instead), there's no actual benefit to using an alias anyway, since the compiler will simply inline the static function into the wrapper. BUG=442327, 460857 TBR=cjhopman@chromium.org Committed: https://crrev.com/cab875835ac9e39183ba0ac4fe30e96d1bdfec45 Cr-Commit-Position: refs/heads/master@{#317787}

Patch Set 1 #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+24 lines, -40 lines) Patch
M base/android/jni_generator/jni_generator.py View 1 chunk +4 lines, -2 lines 0 comments Download
M base/android/jni_generator/testNativeExportsOption.golden View 1 chunk +8 lines, -4 lines 0 comments Download
M base/android/jni_generator/testNativeExportsOptionalOption.golden View 1 chunk +8 lines, -4 lines 0 comments Download
M build/config/android/rules.gni View 3 chunks +2 lines, -12 lines 0 comments Download
M build/jar_file_jni_generator.gypi View 2 chunks +1 line, -9 lines 1 comment Download
M build/jni_generator.gypi View 2 chunks +1 line, -9 lines 1 comment Download

Messages

Total messages: 17 (5 generated)
Torne
5 years, 10 months ago (2015-02-23 18:51:36 UTC) #2
Torne
This turns out to be super trivial, I have no idea why I didn't just ...
5 years, 10 months ago (2015-02-23 19:24:34 UTC) #3
rmcilroy
lgtm with a couple of nits. Thanks! https://codereview.chromium.org/953523003/diff/1/build/jar_file_jni_generator.gypi File build/jar_file_jni_generator.gypi (right): https://codereview.chromium.org/953523003/diff/1/build/jar_file_jni_generator.gypi#newcode70 build/jar_file_jni_generator.gypi:70: 'native_exports%': '--native_exports', ...
5 years, 10 months ago (2015-02-23 22:46:40 UTC) #4
pasko
fly by lgtm that extra aliasing seems to have broken our -section-ordering-file logic (at least ...
5 years, 10 months ago (2015-02-24 10:35:20 UTC) #5
Torne
On 2015/02/24 10:35:20, pasko wrote: > fly by lgtm > > that extra aliasing seems ...
5 years, 10 months ago (2015-02-24 11:09:07 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/953523003/1
5 years, 10 months ago (2015-02-24 11:09:35 UTC) #8
Torne
On 2015/02/23 22:46:40, rmcilroy wrote: > lgtm with a couple of nits. Thanks! > > ...
5 years, 10 months ago (2015-02-24 11:16:55 UTC) #9
Torne
TBRing cjhopman@ for build config stuff as I forgot to ask him to review and ...
5 years, 10 months ago (2015-02-24 11:18:35 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/953523003/1
5 years, 10 months ago (2015-02-24 11:19:16 UTC) #14
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 10 months ago (2015-02-24 12:55:11 UTC) #15
commit-bot: I haz the power
Patchset 1 (id:??) landed as https://crrev.com/cab875835ac9e39183ba0ac4fe30e96d1bdfec45 Cr-Commit-Position: refs/heads/master@{#317787}
5 years, 10 months ago (2015-02-24 12:55:44 UTC) #16
cjhopman
5 years, 10 months ago (2015-02-24 21:03:39 UTC) #17
Message was sent while issue was closed.
lgtm

Powered by Google App Engine
This is Rietveld 408576698