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

Issue 570203002: Make chrome_shell_apk build (Closed)

Created:
6 years, 3 months ago by cjhopman
Modified:
6 years, 2 months ago
CC:
chromium-reviews, darin-cc_chromium.org, haitaol+watch_chromium.org, jam, jamesr, klundberg+watch_chromium.org, maniscalco+watch_chromium.org, tfarina, tim+watch_chromium.org, yfriedman+watch_chromium.org, zea+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@gn-chrome-jamesr
Project:
chromium
Visibility:
Public.

Description

Make chrome_shell_apk build This mostly just adds the chrome_shell_apk build definition and those of a whole bunch of targets. Adds a simple check that when DEPRECATED_java_in_dir is used, it actually includes the "src" at the end (GYP just assumes that you really meant that java files are in <(java_in_dir)/src). Makes the call to process_resources only generate R.java for extra packages when being run as part of the apk step (otherwise, for example, both chrome resources and content resources would contain an R.java for net resources and compilation would fail). Depends on https://codereview.chromium.org/581273004/ Adds the following targets -- and enables ~300 more (550 counting template-generated inner targets): //chrome:chrome_android_core //chrome/android:chrome_strings_grd //chrome/android:chrome_java //chrome/android:activity_type_ids_javagen //chrome/android:app_banner_metrics_ids_javagen //chrome/android:resource_id_javagen //chrome/android:profile_account_management_metrics_javagen //chrome/android:profile_sync_service_model_type_selection_javagen //chrome/android:toolbar_model_security_levels_javagen //chrome/android:tab_load_status_javagen //chrome/android:chrome_shell_base //chrome/android:chrome_shell //chrome/android:chrome_sync_shell //chrome/android:chrome_shell_resources //chrome/android:chrome_shell_java //chrome/android:chrome_shell_assets //chrome/android:chrome_shell_apk //chrome/android:chrome_sync_shell_apk //components/bookmarks:bookmarks_java //components/bookmarks:bookmarks_jni_headers //components/bookmarks:bookmark_type_javagen //components/dom_distiller/android:dom_distiller_core_java //components/dom_distiller/android:dom_distiller_core_font_family_javagen //components/dom_distiller/android:dom_distiller_core_theme_javagen //components/enhanced_bookmarks:jni_headers //components/enhanced_bookmarks/android:enhanced_bookmarks_java //components/gcm_driver:gcm_driver_java //components/gcm_driver:jni_headers //components/navigation_interception/android:navigation_interception_java //components/variations:variations_java //components/web_contents_delegate_android:web_contents_delegate_android //components/web_contents_delegate_android:web_contents_delegate_android_java //components/web_contents_delegate_android:web_contents_delegate_android_jni_headers //printing:printing_java //sync:fake_server_jni //sync:sync_java_test_support //sync:test_support_sync_fake_server_android //sync:sync_unit_tests_apk //sync/android:sync_java //sync/android:sync_javatests BUG=359249 TBR=ben Committed: https://crrev.com/11a68cbf1df1110ebac0b649edf2aef22682387e Cr-Commit-Position: refs/heads/master@{#299381}

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 1

Patch Set 5 : Rebase #

Total comments: 8

Patch Set 6 : Rebase #

Patch Set 7 : Address comments #

Patch Set 8 : Fix extensions dependencies #

Patch Set 9 : Rebase add chrome_version_java/page_connection_info_javagen #

Unified diffs Side-by-side diffs Delta from patch set Stats (+909 lines, -146 lines) Patch
M BUILD.gn View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M build/android/gyp/write_build_config.py View 1 chunk +3 lines, -0 lines 0 comments Download
M build/config/android/config.gni View 1 chunk +1 line, -0 lines 0 comments Download
M build/config/android/internal_rules.gni View 1 2 3 4 5 6 5 chunks +25 lines, -12 lines 0 comments Download
M build/config/android/rules.gni View 1 2 3 4 4 chunks +14 lines, -4 lines 0 comments Download
M chrome/BUILD.gn View 1 2 3 4 5 6 7 8 3 chunks +50 lines, -1 line 0 comments Download
A chrome/android/BUILD.gn View 1 2 3 4 5 6 7 8 1 chunk +409 lines, -0 lines 0 comments Download
M chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java View 1 2 3 4 1 chunk +39 lines, -40 lines 0 comments Download
M chrome/browser/ui/BUILD.gn View 1 2 3 4 1 chunk +6 lines, -1 line 0 comments Download
M chrome/chrome.gyp View 1 2 3 4 5 6 7 8 4 chunks +3 lines, -1 line 0 comments Download
M chrome/chrome_android.gypi View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -0 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 4 5 6 7 8 8 chunks +8 lines, -0 lines 0 comments Download
M chrome/chrome_shell.gypi View 7 chunks +7 lines, -0 lines 0 comments Download
M chrome/common/BUILD.gn View 1 2 3 4 5 6 7 3 chunks +2 lines, -3 lines 0 comments Download
M components/bookmarks.gypi View 3 chunks +3 lines, -0 lines 0 comments Download
A components/bookmarks/common/android/BUILD.gn View 1 1 chunk +35 lines, -0 lines 0 comments Download
M components/dom_distiller.gypi View 4 chunks +4 lines, -0 lines 0 comments Download
A components/dom_distiller/android/BUILD.gn View 1 chunk +42 lines, -0 lines 0 comments Download
M components/enhanced_bookmarks.gypi View 1 2 3 4 2 chunks +2 lines, -0 lines 0 comments Download
M components/enhanced_bookmarks/BUILD.gn View 1 2 3 4 2 chunks +2 lines, -0 lines 0 comments Download
M components/gcm_driver.gypi View 1 2 3 4 5 2 chunks +2 lines, -1 line 0 comments Download
M components/gcm_driver/BUILD.gn View 1 2 3 4 5 2 chunks +1 line, -14 lines 0 comments Download
A components/gcm_driver/android/BUILD.gn View 1 chunk +26 lines, -0 lines 0 comments Download
M components/invalidation/BUILD.gn View 1 2 3 4 4 chunks +36 lines, -28 lines 0 comments Download
M components/navigation_interception.gypi View 1 2 3 4 1 chunk +1 line, -0 lines 0 comments Download
M components/navigation_interception/BUILD.gn View 1 2 3 4 1 chunk +1 line, -2 lines 0 comments Download
A + components/navigation_interception/android/BUILD.gn View 1 2 3 4 1 chunk +4 lines, -8 lines 0 comments Download
M components/variations.gypi View 2 chunks +2 lines, -1 line 0 comments Download
M components/variations/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
A + components/variations/android/BUILD.gn View 1 chunk +9 lines, -4 lines 0 comments Download
M components/web_contents_delegate_android.gypi View 3 chunks +3 lines, -0 lines 0 comments Download
A components/web_contents_delegate_android/BUILD.gn View 1 2 3 4 5 6 1 chunk +52 lines, -0 lines 0 comments Download
M content/public/test/android/BUILD.gn View 1 chunk +1 line, -1 line 0 comments Download
M device/usb/BUILD.gn View 1 2 3 4 1 chunk +2 lines, -0 lines 0 comments Download
M extensions/BUILD.gn View 1 2 3 4 5 6 7 2 chunks +10 lines, -5 lines 0 comments Download
M printing/BUILD.gn View 2 chunks +8 lines, -12 lines 0 comments Download
M printing/printing.gyp View 3 chunks +5 lines, -3 lines 0 comments Download
M sync/BUILD.gn View 1 2 3 4 5 6 2 chunks +48 lines, -1 line 0 comments Download
A sync/android/BUILD.gn View 1 2 3 4 1 chunk +31 lines, -0 lines 0 comments Download
M sync/sync_android.gypi View 1 chunk +1 line, -0 lines 0 comments Download
M sync/sync_tests.gypi View 1 2 3 4 5 chunks +5 lines, -4 lines 0 comments Download
M third_party/libusb/BUILD.gn View 1 2 3 4 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 24 (7 generated)
cjhopman
brettw: * This is a little big, but it's mostly trivial conversions.
6 years, 3 months ago (2014-09-19 01:53:11 UTC) #2
cjhopman
https://codereview.chromium.org/570203002/diff/60001/chrome/android/BUILD.gn File chrome/android/BUILD.gn (right): https://codereview.chromium.org/570203002/diff/60001/chrome/android/BUILD.gn#newcode207 chrome/android/BUILD.gn:207: shared_library("chrome_shell") { jamesr, I know you've been working at ...
6 years, 3 months ago (2014-09-19 01:55:49 UTC) #3
brettw
lgtm https://codereview.chromium.org/570203002/diff/80001/build/config/android/internal_rules.gni File build/config/android/internal_rules.gni (right): https://codereview.chromium.org/570203002/diff/80001/build/config/android/internal_rules.gni#newcode576 build/config/android/internal_rules.gni:576: Nit: two blank lines. https://codereview.chromium.org/570203002/diff/80001/chrome/BUILD.gn File chrome/BUILD.gn (right): ...
6 years, 2 months ago (2014-10-09 17:05:31 UTC) #4
cjhopman
https://codereview.chromium.org/570203002/diff/80001/build/config/android/internal_rules.gni File build/config/android/internal_rules.gni (right): https://codereview.chromium.org/570203002/diff/80001/build/config/android/internal_rules.gni#newcode576 build/config/android/internal_rules.gni:576: On 2014/10/09 17:05:31, brettw wrote: > Nit: two blank ...
6 years, 2 months ago (2014-10-10 01:10:09 UTC) #5
cjhopman
jochen: components/ ben@ for OWNERS of chrome/ + some random other bits
6 years, 2 months ago (2014-10-10 01:11:33 UTC) #7
Ben Goodger (Google)
Can you be more precise about "random other bits"? On Thu, Oct 9, 2014 at ...
6 years, 2 months ago (2014-10-10 03:30:16 UTC) #8
jochen (gone - plz use gerrit)
do you actually want me to do an indepth review, or just rubberstamp brett's review?
6 years, 2 months ago (2014-10-10 11:12:21 UTC) #9
cjhopman
On 2014/10/10 11:12:21, jochen wrote: > do you actually want me to do an indepth ...
6 years, 2 months ago (2014-10-10 16:33:47 UTC) #11
Nicolas Zea
rubberstamp sync LGTM
6 years, 2 months ago (2014-10-10 23:45:57 UTC) #12
jochen (gone - plz use gerrit)
//components lgtm
6 years, 2 months ago (2014-10-13 08:13:29 UTC) #13
cjhopman
nyquist: for chrome/android OWNERS ben: TBRed for changes in chrome/ (but not c/android) device/usb, printing/, ...
6 years, 2 months ago (2014-10-13 18:39:17 UTC) #15
nyquist
chrome/android lgtm
6 years, 2 months ago (2014-10-13 20:49:51 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/570203002/590001
6 years, 2 months ago (2014-10-13 20:58:21 UTC) #18
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/17327)
6 years, 2 months ago (2014-10-13 21:07:33 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/570203002/590001
6 years, 2 months ago (2014-10-13 22:04:04 UTC) #22
commit-bot: I haz the power
Committed patchset #9 (id:590001)
6 years, 2 months ago (2014-10-13 22:48:04 UTC) #23
commit-bot: I haz the power
6 years, 2 months ago (2014-10-13 22:48:48 UTC) #24
Message was sent while issue was closed.
Patchset 9 (id:??) landed as
https://crrev.com/11a68cbf1df1110ebac0b649edf2aef22682387e
Cr-Commit-Position: refs/heads/master@{#299381}

Powered by Google App Engine
This is Rietveld 408576698