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

Issue 456493002: Add native libraries to gn apks (Closed)

Created:
6 years, 4 months ago by cjhopman
Modified:
6 years, 4 months ago
Reviewers:
brettw, newt (away)
CC:
chromium-reviews, klundberg+watch_chromium.org, erikwright+watch_chromium.org, yfriedman+watch_chromium.org, ilevy-cc_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Add native libraries to gn apks First, change the NativeLibraries template to use preprocessor defines instead of includes. This allows us to delete all the corresponding headers. Then, change the ordered libraries file to be a dict with both the list of library paths and the java-style list of library names. Update a bunch of things that used the ordered libraries file to instead take the list of libraries directly as an argument (as a FileArg in every case). Add calculating the list of libraries to write_build_config and add it to the build config (gn can use this then instead of a separate ordered libraries file). Add a simple copy step in gn to set up the native libraries directory for an apk. Use this directory when creating the apk. BUG=359249 NOTRY=true Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290963

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 14

Patch Set 5 : #

Patch Set 6 : #

Patch Set 7 : Fix a long line before brettw@ sees it #

Patch Set 8 : Rebase #

Unified diffs Side-by-side diffs Delta from patch set Stats (+295 lines, -182 lines) Patch
M base/BUILD.gn View 1 2 3 4 5 6 7 1 chunk +0 lines, -5 lines 0 comments Download
M base/android/java/templates/NativeLibraries.template View 1 chunk +13 lines, -6 lines 0 comments Download
D base/android/java/templates/native_libraries_array.h View 1 chunk +0 lines, -20 lines 0 comments Download
D base/android/java/templates/native_libraries_version.h View 1 chunk +0 lines, -9 lines 0 comments Download
M base/base.gyp View 1 2 3 4 5 6 7 1 chunk +1 line, -4 lines 0 comments Download
A build/android/gyp/copy_ex.py View 1 2 3 4 5 1 chunk +55 lines, -0 lines 0 comments Download
M build/android/gyp/create_device_library_links.py View 1 2 3 4 chunks +8 lines, -7 lines 0 comments Download
D build/android/gyp/create_native_libraries_header.py View 1 chunk +0 lines, -56 lines 0 comments Download
M build/android/gyp/gcc_preprocess.py View 3 chunks +5 lines, -3 lines 0 comments Download
M build/android/gyp/pack_arm_relocations.py View 1 2 3 4 chunks +7 lines, -8 lines 0 comments Download
M build/android/gyp/push_libraries.py View 3 chunks +8 lines, -7 lines 0 comments Download
M build/android/gyp/strip_library_for_device.py View 1 2 3 4 4 chunks +8 lines, -9 lines 0 comments Download
M build/android/gyp/write_build_config.py View 1 2 3 4 4 chunks +30 lines, -2 lines 0 comments Download
M build/android/gyp/write_ordered_libraries.py View 1 2 3 4 3 chunks +33 lines, -10 lines 0 comments Download
M build/android/pack_arm_relocations.gypi View 2 chunks +2 lines, -2 lines 0 comments Download
M build/android/push_libraries.gypi View 1 2 3 4 1 chunk +1 line, -1 line 0 comments Download
M build/android/strip_native_libraries.gypi View 1 chunk +1 line, -1 line 0 comments Download
M build/config/android/config.gni View 1 2 3 4 2 chunks +9 lines, -0 lines 0 comments Download
M build/config/android/internal_rules.gni View 1 2 3 4 5 2 chunks +37 lines, -0 lines 0 comments Download
M build/config/android/rules.gni View 1 2 3 4 5 6 7 chunks +72 lines, -8 lines 0 comments Download
M build/java_apk.gypi View 1 2 3 4 4 chunks +5 lines, -24 lines 0 comments Download

Messages

Total messages: 20 (0 generated)
cjhopman
newt: *
6 years, 4 months ago (2014-08-08 20:44:44 UTC) #1
newt (away)
https://codereview.chromium.org/456493002/diff/60001/build/android/gyp/copy_ex.py File build/android/gyp/copy_ex.py (right): https://codereview.chromium.org/456493002/diff/60001/build/android/gyp/copy_ex.py#newcode21 build/android/gyp/copy_ex.py:21: parser.add_option('--todir', help='Directory to copy files to.') "dest"? https://codereview.chromium.org/456493002/diff/60001/build/android/gyp/copy_ex.py#newcode32 build/android/gyp/copy_ex.py:32: ...
6 years, 4 months ago (2014-08-11 23:55:24 UTC) #2
cjhopman
https://codereview.chromium.org/456493002/diff/60001/build/android/gyp/copy_ex.py File build/android/gyp/copy_ex.py (right): https://codereview.chromium.org/456493002/diff/60001/build/android/gyp/copy_ex.py#newcode21 build/android/gyp/copy_ex.py:21: parser.add_option('--todir', help='Directory to copy files to.') On 2014/08/11 23:55:23, ...
6 years, 4 months ago (2014-08-18 01:21:12 UTC) #3
newt (away)
lgtm
6 years, 4 months ago (2014-08-18 13:59:43 UTC) #4
cjhopman
brettw for OWNERS
6 years, 4 months ago (2014-08-18 20:04:54 UTC) #5
cjhopman
ping
6 years, 4 months ago (2014-08-20 21:32:10 UTC) #6
brettw
rs lgtm
6 years, 4 months ago (2014-08-20 22:27:30 UTC) #7
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 4 months ago (2014-08-20 22:37:21 UTC) #8
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/456493002/140001
6 years, 4 months ago (2014-08-20 22:39:28 UTC) #9
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: linux_gpu on tryserver.chromium.gpu ...
6 years, 4 months ago (2014-08-20 23:29:32 UTC) #10
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 4 months ago (2014-08-20 23:33:26 UTC) #11
commit-bot: I haz the power
Try jobs failed on following builders: linux_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/55266)
6 years, 4 months ago (2014-08-20 23:33:27 UTC) #12
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 4 months ago (2014-08-20 23:40:15 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/456493002/140001
6 years, 4 months ago (2014-08-20 23:42:15 UTC) #14
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: linux_gpu on tryserver.chromium.gpu ...
6 years, 4 months ago (2014-08-21 00:29:01 UTC) #15
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 4 months ago (2014-08-21 00:32:16 UTC) #16
commit-bot: I haz the power
Try jobs failed on following builders: linux_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/55344)
6 years, 4 months ago (2014-08-21 00:32:18 UTC) #17
cjhopman
The CQ bit was checked by cjhopman@chromium.org
6 years, 4 months ago (2014-08-21 00:38:15 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/456493002/140001
6 years, 4 months ago (2014-08-21 00:40:48 UTC) #19
commit-bot: I haz the power
6 years, 4 months ago (2014-08-21 00:43:14 UTC) #20
Message was sent while issue was closed.
Committed patchset #8 (140001) as 290963

Powered by Google App Engine
This is Rietveld 408576698