Issue 1594653002: [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2)

Issue 1594653002: [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2) (Closed)

Created:
4 years, 11 months ago by jbudorick

Modified:
4 years, 11 months ago

Reviewers:
Yaron, Nico, agrieve, Paweł Hajdan Jr.

CC:
chromium-reviews, klundberg+watch_chromium.org, mikecase+watch_chromium.org, jbudorick+watch_chromium.org, yfriedman+watch_chromium.org, vmpstr+watch_chromium.org

Base URL:
https://chromium.googlesource.com/chromium/src.git@master

Target Ref:
refs/pending/heads/master

Project:
chromium

Visibility:
Public.

More Reviews

Description

[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2) this is a reland of https://codereview.chromium.org/1590243003/ BUG=272790 TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org Committed: https://crrev.com/070dd8c416495cb051617b05681353e096c463b7 Cr-Commit-Position: refs/heads/master@{#369906}

Patch Set 2 : fixed #

Created: 4 years, 11 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+168 lines, -152 lines)			Patch
M	base/BUILD.gn	View		3 chunks	+4 lines, -5 lines	0 comments	Download
M	base/android/java/src/org/chromium/base/BaseChromiumApplication.java	View		2 chunks	+2 lines, -2 lines	0 comments	Download
A +	base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java	View		7 chunks	+6 lines, -10 lines	0 comments	Download
M	base/android/java/templates/ChromiumMultiDex.template	View		1 chunk	+10 lines, -103 lines	0 comments	Download
M	base/base.gyp	View		4 chunks	+10 lines, -4 lines	0 comments	Download
M	base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java	View		2 chunks	+2 lines, -2 lines	0 comments	Download
M	build/android/gyp/configure_multidex.py	View		2 chunks	+41 lines, -9 lines	0 comments	Download
M	build/android/java_cpp_template.gypi	View		2 chunks	+0 lines, -2 lines	0 comments	Download
M	build/android/pylib/remote/device/dummy/dummy.gyp	View		2 chunks	+23 lines, -1 line	0 comments	Download
M	build/apk_browsertest.gypi	View		1 chunk	+1 line, -1 line	0 comments	Download
M	build/apk_test.gypi	View		1 chunk	+1 line, -1 line	0 comments	Download
M	build/config/android/rules.gni	View		2 chunks	+19 lines, -2 lines	0 comments	Download
M	build/java_apk.gypi	View	1	5 chunks	+43 lines, -10 lines	0 comments	Download
M	chrome/chrome_tests_unit.gypi	View		1 chunk	+1 line, -0 lines	0 comments	Download
M	chrome/test/BUILD.gn	View		1 chunk	+1 line, -0 lines	0 comments	Download
M	testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java	View		2 chunks	+3 lines, -0 lines	0 comments	Download
M	testing/test.gni	View		1 chunk	+1 line, -0 lines	0 comments	Download

Messages

Total messages: 9 (4 generated)

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages

jbudorick

from cronet_sample_apk.ninja before: build cronet_sample_apk/compile.stamp $ cronet_sample_apk/cronet_sample_apk.javac.jar: $ cronet_sample_apk_target_javac_cronet_sample_apk_9f7c2a013b167e1e705afb9ef91e030e $ ../../build/android/gyp/util/build_utils.py $ ../../build/android/gyp/javac.py $ ../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java ...

4 years, 11 months ago (2016-01-15 23:41:39 UTC) #3

from cronet_sample_apk.ninja

before:

build cronet_sample_apk/compile.stamp $
    cronet_sample_apk/cronet_sample_apk.javac.jar: $
   
cronet_sample_apk_target_javac_cronet_sample_apk_9f7c2a013b167e1e705afb9ef91e030e
$
    ../../build/android/gyp/util/build_utils.py $
    ../../build/android/gyp/javac.py $
   
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
$
   
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
$
   
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/multidex/library/libs/android-support-multidex.jar
$
    lib.java/jsr_305_javalib.jar lib.java/base_java.jar $
   
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar
$
    lib.java/cronet_api.jar lib.java/url_java.jar lib.java/net_java.jar $
    lib.java/cronet_java.jar cronet_sample_apk/codegen.stamp $
    cronet_sample_apk/native_libraries_java.stamp || $
    obj/components/cronet_sample_apk.actions_depends.stamp

after:

build cronet_sample_apk/compile.stamp $
    cronet_sample_apk/cronet_sample_apk.javac.jar: $
   
cronet_sample_apk_target_javac_cronet_sample_apk_9f7c2a013b167e1e705afb9ef91e030e
$
    ../../build/android/gyp/util/build_utils.py $
    ../../build/android/gyp/javac.py $
   
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
$
   
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
$
   
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/multidex/library/libs/android-support-multidex.jar
$
    lib.java/jsr_305_javalib.jar lib.java/base_java.jar $
   
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar
$
    lib.java/cronet_api.jar lib.java/url_java.jar lib.java/net_java.jar $
    lib.java/cronet_java.jar cronet_sample_apk/codegen.stamp $
    cronet_sample_apk/native_libraries_java.stamp $
    cronet_sample_apk/multidex_config_java.stamp || $
    obj/components/cronet_sample_apk.actions_depends.stamp

notably, multidex_config_java.stamp is now present.

agrieve: ptal
thakis, yfriedman, phajdan.jr: tbr because there are still no new changes to
base/, chrome/, or testing/

agrieve

On 2016/01/15 23:41:39, jbudorick wrote: > from cronet_sample_apk.ninja > > before: > > build cronet_sample_apk/compile.stamp ...

4 years, 11 months ago (2016-01-16 00:57:11 UTC) #4

On 2016/01/15 23:41:39, jbudorick wrote:
> from cronet_sample_apk.ninja
> 
> before:
> 
> build cronet_sample_apk/compile.stamp $
>     cronet_sample_apk/cronet_sample_apk.javac.jar: $
>    
>
cronet_sample_apk_target_javac_cronet_sample_apk_9f7c2a013b167e1e705afb9ef91e030e
> $
>     ../../build/android/gyp/util/build_utils.py $
>     ../../build/android/gyp/javac.py $
>    
>
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
> $
>    
>
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
> $
>    
>
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/multidex/library/libs/android-support-multidex.jar
> $
>     lib.java/jsr_305_javalib.jar lib.java/base_java.jar $
>    
>
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar
> $
>     lib.java/cronet_api.jar lib.java/url_java.jar lib.java/net_java.jar $
>     lib.java/cronet_java.jar cronet_sample_apk/codegen.stamp $
>     cronet_sample_apk/native_libraries_java.stamp || $
>     obj/components/cronet_sample_apk.actions_depends.stamp
> 
> after:
> 
> build cronet_sample_apk/compile.stamp $
>     cronet_sample_apk/cronet_sample_apk.javac.jar: $
>    
>
cronet_sample_apk_target_javac_cronet_sample_apk_9f7c2a013b167e1e705afb9ef91e030e
> $
>     ../../build/android/gyp/util/build_utils.py $
>     ../../build/android/gyp/javac.py $
>    
>
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleActivity.java
> $
>    
>
../../components/cronet/android/sample/src/org/chromium/cronet_sample_apk/CronetSampleApplication.java
> $
>    
>
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/multidex/library/libs/android-support-multidex.jar
> $
>     lib.java/jsr_305_javalib.jar lib.java/base_java.jar $
>    
>
/usr/local/google/code/clankium-split/2/src/third_party/android_tools/sdk/extras/android/support/annotations/android-support-annotations.jar
> $
>     lib.java/cronet_api.jar lib.java/url_java.jar lib.java/net_java.jar $
>     lib.java/cronet_java.jar cronet_sample_apk/codegen.stamp $
>     cronet_sample_apk/native_libraries_java.stamp $
>     cronet_sample_apk/multidex_config_java.stamp || $
>     obj/components/cronet_sample_apk.actions_depends.stamp
> 
> notably, multidex_config_java.stamp is now present.
> 
> agrieve: ptal
> thakis, yfriedman, phajdan.jr: tbr because there are still no new changes to
> base/, chrome/, or testing/

lgtm

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1594653002/20001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1594653002/20001

4 years, 11 months ago (2016-01-16 01:03:44 UTC) #6

commit-bot: I haz the power

4 years, 11 months ago (2016-01-16 01:24:01 UTC) #9

Message was sent while issue was closed.

Patchset 2 (id:??) landed as
https://crrev.com/070dd8c416495cb051617b05681353e096c463b7
Cr-Commit-Position: refs/heads/master@{#369906}

Expand Messages | Collapse Messages | Show Generated Messages | Hide Generated Messages