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

Issue 507523002: Add content_shell_apk target (and a bunch of its dependencies) (Closed)

Created:
6 years, 4 months ago by cjhopman
Modified:
6 years, 3 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, jam, darin-cc_chromium.org, yfriedman+watch_chromium.org, klundberg+watch_chromium.org, erikwright+watch_chromium.org, jochen+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Add content_shell_apk target (and a bunch of its dependencies) The content_shell_apk does not have the full native part that it should. It builds, installs, starts, loads the native library, and then crashes when it tries to access missing native parts. This requires fixes to a bunch of little things: 1. Should only extract java files to compile from srcjars. 2. The way we were creating the single combined resources zip was wrong because we were clobbering xml files (we should only clobber images, xml files need to be handled more carefully). Instead of trying to properly handle xml files, the combined zip now just puts all the different dependencies in different folders (0/, 1/, etc) and then when packaging we detect that type of zip and pass all the subdirs to aapt. 3. java_cpp_template with multiple sources needs to have a unique depfile path for each source 4. jni_generator needs to clear the classlist variable in each loop of foreach (otherwise gn complains about assigning to non-empty list) 5. a couple parts of apk native lib handling was not skipped for an apk with no native lib This adds a bunch of targets: //base:base_java_test_support //content/public/android:content_java_resources //content/public/android:content_java //content/public/android:content_strings_grd //content/public/android:gesture_event_type_java //content/public/android:page_transition_types_java //content/public/android:popup_item_type_java //content/public/android:result_codes_java //content/public/android:selection_event_type_java //content/public/android:speech_recognition_error_java //content/public/android:top_controls_state_java //content/public/android:screen_orientation_values_java //content/public/android:content_gamepad_mapping_java //content/public/android:content_jni_headers //content/shell/android:content_shell_jni_headers //content/shell/android:libcontent_shell_content_view (partial) //content/shell/android:content_shell_java_resources //content/shell/android:content_shell_java //content/shell/android:content_shell_apk_resources //content/shell/android:content_shell_apk //net/android:net_java //net/android:remote_android_keystore_aidl //net/android:net_java_test_support //net/android:net_javatests //net/android:net_errors_java //net/android:certificate_mime_types_java //net/android:cert_verify_status_android_java //net/android:private_key_types_java //net/android:net_unittests_apk (disabled) TBR=yfriedman,thestig BUG=359249 Committed: https://crrev.com/cd7694afb928b265e64be5448bb281ad86771f34 Cr-Commit-Position: refs/heads/master@{#293671}

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : More little fixes #

Patch Set 4 : Rebase #

Total comments: 7

Patch Set 5 : #

Patch Set 6 : Rebase #

Patch Set 7 : Fix PageTransitionTypes.template path #

Unified diffs Side-by-side diffs Delta from patch set Stats (+548 lines, -119 lines) Patch
M BUILD.gn View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
M base/BUILD.gn View 1 2 3 4 5 6 2 chunks +8 lines, -37 lines 0 comments Download
M build/android/gyp/copy_ex.py View 1 2 1 chunk +1 line, -1 line 0 comments Download
M build/android/gyp/javac.py View 1 chunk +1 line, -1 line 0 comments Download
M build/android/gyp/package_resources.py View 1 2 3 4 2 chunks +22 lines, -2 lines 0 comments Download
M build/android/gyp/process_resources.py View 1 2 3 4 2 chunks +16 lines, -2 lines 0 comments Download
M build/android/gyp/util/build_utils.py View 2 chunks +4 lines, -1 line 0 comments Download
M build/android/gyp/write_build_config.py View 1 2 1 chunk +18 lines, -15 lines 0 comments Download
M build/config/android/internal_rules.gni View 1 2 3 4 5 6 1 chunk +5 lines, -1 line 0 comments Download
M build/config/android/rules.gni View 1 2 3 4 5 6 12 chunks +71 lines, -54 lines 0 comments Download
M components/crash/browser/BUILD.gn View 1 1 chunk +4 lines, -0 lines 0 comments Download
M content/public/android/BUILD.gn View 1 2 3 4 5 6 2 chunks +200 lines, -0 lines 0 comments Download
M content/shell/BUILD.gn View 1 2 3 4 5 6 2 chunks +3 lines, -3 lines 0 comments Download
A content/shell/android/BUILD.gn View 1 2 3 4 1 chunk +98 lines, -0 lines 0 comments Download
A net/android/BUILD.gn View 1 2 3 4 1 chunk +94 lines, -0 lines 0 comments Download
M ui/android/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download

Messages

Total messages: 23 (9 generated)
cjhopman
newt: *
6 years, 3 months ago (2014-08-30 01:20:38 UTC) #2
newt (away)
a few suggestions, then lgtm https://codereview.chromium.org/507523002/diff/60001/build/android/gyp/package_resources.py File build/android/gyp/package_resources.py (right): https://codereview.chromium.org/507523002/diff/60001/build/android/gyp/package_resources.py#newcode95 build/android/gyp/package_resources.py:95: if subdirs and os.path.basename(subdirs[0]) ...
6 years, 3 months ago (2014-09-02 23:41:31 UTC) #3
cjhopman
https://codereview.chromium.org/507523002/diff/60001/build/android/gyp/package_resources.py File build/android/gyp/package_resources.py (right): https://codereview.chromium.org/507523002/diff/60001/build/android/gyp/package_resources.py#newcode95 build/android/gyp/package_resources.py:95: if subdirs and os.path.basename(subdirs[0]) == '0': On 2014/09/02 23:41:30, ...
6 years, 3 months ago (2014-09-04 01:14:58 UTC) #4
cjhopman
brettw for OWNERS of almost everything
6 years, 3 months ago (2014-09-04 18:12:21 UTC) #6
brettw
lgtm
6 years, 3 months ago (2014-09-04 21:03:27 UTC) #7
cjhopman
yfriedman: TBR for net/android thestig: TBR for components/crash
6 years, 3 months ago (2014-09-06 01:39:50 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/507523002/100001
6 years, 3 months ago (2014-09-06 01:41:38 UTC) #12
commit-bot: I haz the power
Try jobs failed on following builders: android_chromium_gn_compile_rel on tryserver.chromium.linux (http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromium_gn_compile_rel/builds/12965)
6 years, 3 months ago (2014-09-06 02:00:11 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/507523002/140001
6 years, 3 months ago (2014-09-06 02:19:54 UTC) #16
Lei Zhang
components/crash lgtm
6 years, 3 months ago (2014-09-06 03:35:09 UTC) #17
commit-bot: I haz the power
Exceeded time limit waiting for builds to trigger.
6 years, 3 months ago (2014-09-06 08:22:10 UTC) #19
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/507523002/140001
6 years, 3 months ago (2014-09-07 23:59:46 UTC) #21
commit-bot: I haz the power
Committed patchset #7 (id:140001) as d5ed448411db612eb7cf7973fa853359aca0965e
6 years, 3 months ago (2014-09-08 00:00:47 UTC) #22
commit-bot: I haz the power
6 years, 3 months ago (2014-09-10 03:44:31 UTC) #23
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/cd7694afb928b265e64be5448bb281ad86771f34
Cr-Commit-Position: refs/heads/master@{#293671}

Powered by Google App Engine
This is Rietveld 408576698