|
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}
Total comments: 1
Total comments: 8
|
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
|
Total messages: 24 (7 generated)
|