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

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed)

Created:
5 years ago by jbudorick
Modified:
5 years ago
Reviewers:
Ted C, Yaron, mef, agrieve, Nico
CC:
chromium-reviews, cbentzel+watch_chromium.org, vmpstr+watch_chromium.org, mikecase+watch_chromium.org, klundberg+watch_chromium.org, jbudorick+watch_chromium.org, yfriedman+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

[Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. BUG=488195 Committed: https://crrev.com/06215e9286247b08ff6c958f725c6e5185c4acd1 Cr-Commit-Position: refs/heads/master@{#365254}

Patch Set 1 #

Patch Set 2 : fix gn #

Patch Set 3 : --no-find-copies #

Patch Set 4 : aidl cleaning #

Total comments: 4

Patch Set 5 : agrieve comments #

Total comments: 11

Patch Set 6 : yfriedman comments #

Total comments: 28

Patch Set 7 : mef comments % directory checks #

Patch Set 8 : missed require_net_test_support_apk comment #

Total comments: 6

Patch Set 9 : mef comments 2 #

Patch Set 10 : fix release builds + restore INTERNET permission #

Patch Set 11 : fix gn #

Patch Set 12 : rebase #

Patch Set 13 : +landmine for GN #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+707 lines, -70 lines) Patch
M base/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 2 chunks +11 lines, -0 lines 0 comments Download
M base/android/java/templates/NativeLibraries.template View 1 chunk +10 lines, -2 lines 0 comments Download
M base/base.gyp View 1 2 3 4 5 6 7 8 9 10 11 2 chunks +15 lines, -0 lines 0 comments Download
A base/test/android/java/templates/NativeTestLibraries.template View 1 2 3 4 5 6 1 chunk +9 lines, -0 lines 0 comments Download
A base/test/android/javatests/src/org/chromium/base/test/library_loader/TestLibraryLoader.java View 1 chunk +18 lines, -0 lines 0 comments Download
M build/android/pylib/instrumentation/instrumentation_test_instance.py View 1 2 3 4 5 6 7 8 9 10 2 chunks +0 lines, -9 lines 0 comments Download
M build/android/pylib/local/device/local_device_instrumentation_test_run.py View 1 2 3 4 5 6 7 8 9 10 11 1 chunk +1 line, -1 line 0 comments Download
M build/android/pylib/remote/device/remote_device_instrumentation_test_run.py View 1 chunk +0 lines, -1 line 0 comments Download
M build/config/android/rules.gni View 1 2 3 4 5 6 7 8 9 10 11 12 4 chunks +37 lines, -3 lines 0 comments Download
M build/get_landmines.py View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -0 lines 2 comments Download
M build/java_apk.gypi View 1 2 3 4 5 6 7 8 9 7 chunks +33 lines, -5 lines 0 comments Download
M net/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 11 12 1 chunk +1 line, -1 line 0 comments Download
M net/android/BUILD.gn View 1 2 3 4 5 6 7 8 9 10 2 chunks +55 lines, -1 line 0 comments Download
M net/net.gyp View 1 2 3 4 5 6 7 8 9 10 4 chunks +69 lines, -4 lines 0 comments Download
A net/test/android/javatests/AndroidManifest.xml View 1 2 3 4 5 6 7 8 9 1 chunk +27 lines, -0 lines 0 comments Download
M net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java View 1 2 3 4 5 6 7 chunks +155 lines, -39 lines 0 comments Download
A net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerImpl.java View 1 2 3 4 5 6 7 8 1 chunk +170 lines, -0 lines 0 comments Download
A net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServerService.java View 1 chunk +19 lines, -0 lines 0 comments Download
A net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerImpl.aidl View 1 2 3 4 5 6 7 8 1 chunk +41 lines, -0 lines 0 comments Download
A net/test/android/javatests/src/org/chromium/net/test/IEmbeddedTestServerInterface.aidl View 1 2 3 1 chunk +5 lines, -0 lines 0 comments Download
A net/test/android/javatests/src_dummy/org/chromium/net/test/dummy/Dummy.java View 1 2 1 chunk +11 lines, -0 lines 0 comments Download
A net/test/android/net_test_entry_point.cc View 1 2 1 chunk +14 lines, -0 lines 0 comments Download
M net/test/embedded_test_server/android/embedded_test_server_android.cc View 1 2 3 4 5 6 1 chunk +5 lines, -4 lines 0 comments Download

Messages

Total messages: 32 (8 generated)
jbudorick
This is a continuation of https://codereview.chromium.org/1218053003/ based on cjhopman's last comment on that review. I've ...
5 years ago (2015-11-24 04:51:40 UTC) #2
agrieve
Just one question. https://codereview.chromium.org/1465383003/diff/60001/build/config/android/rules.gni File build/config/android/rules.gni (right): https://codereview.chromium.org/1465383003/diff/60001/build/config/android/rules.gni#newcode1884 build/config/android/rules.gni:1884: "//base:base_java", Shouldn't be necessary? https://codereview.chromium.org/1465383003/diff/60001/net/test/android/javatests/AndroidManifest.xml File ...
5 years ago (2015-11-24 16:27:14 UTC) #3
jbudorick
https://codereview.chromium.org/1465383003/diff/60001/build/config/android/rules.gni File build/config/android/rules.gni (right): https://codereview.chromium.org/1465383003/diff/60001/build/config/android/rules.gni#newcode1884 build/config/android/rules.gni:1884: "//base:base_java", On 2015/11/24 16:27:14, agrieve wrote: > Shouldn't be ...
5 years ago (2015-11-24 18:19:28 UTC) #4
agrieve
lgtm
5 years ago (2015-11-24 18:29:25 UTC) #5
Yaron
https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn File base/BUILD.gn (right): https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn#newcode1692 base/BUILD.gn:1692: "*/NativeTestLibraries##*.class", Why isn't this needed for gyp? https://codereview.chromium.org/1465383003/diff/80001/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java File ...
5 years ago (2015-11-24 19:06:28 UTC) #6
mef
On 2015/11/24 19:06:28, Yaron wrote: > https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn > File base/BUILD.gn (right): > > https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn#newcode1692 > ...
5 years ago (2015-11-24 19:18:43 UTC) #7
jbudorick
mef: yep, that's exactly what's going on. https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn File base/BUILD.gn (right): https://codereview.chromium.org/1465383003/diff/80001/base/BUILD.gn#newcode1692 base/BUILD.gn:1692: "*/NativeTestLibraries##*.class", On ...
5 years ago (2015-11-25 02:43:40 UTC) #8
Yaron
last round from me - just 2 main q's https://codereview.chromium.org/1465383003/diff/80001/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java File net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java (right): https://codereview.chromium.org/1465383003/diff/80001/net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java#newcode79 net/test/android/javatests/src/org/chromium/net/test/EmbeddedTestServer.java:79: ...
5 years ago (2015-11-25 16:04:55 UTC) #9
mef
https://codereview.chromium.org/1465383003/diff/80001/net/net.gyp File net/net.gyp (right): https://codereview.chromium.org/1465383003/diff/80001/net/net.gyp#newcode1417 net/net.gyp:1417: 'target_name': 'embedded_test_server_aidl', FWIW I don't think calling this 'embedded' ...
5 years ago (2015-11-25 17:20:22 UTC) #10
jbudorick
Kept the EmbeddedTestServer name and held off on adding the directory checks on top of ...
5 years ago (2015-12-01 15:38:23 UTC) #11
Yaron
lgtm https://codereview.chromium.org/1465383003/diff/100001/net/net.gyp File net/net.gyp (right): https://codereview.chromium.org/1465383003/diff/100001/net/net.gyp#newcode1475 net/net.gyp:1475: 'target_name': 'require_net_test_support_apk', On 2015/12/01 15:38:23, jbudorick wrote: > ...
5 years ago (2015-12-01 22:43:31 UTC) #12
jbudorick
https://codereview.chromium.org/1465383003/diff/100001/net/net.gyp File net/net.gyp (right): https://codereview.chromium.org/1465383003/diff/100001/net/net.gyp#newcode1475 net/net.gyp:1475: 'target_name': 'require_net_test_support_apk', On 2015/12/01 22:43:31, Yaron wrote: > On ...
5 years ago (2015-12-02 01:13:27 UTC) #13
mef
lgtm with nits. https://codereview.chromium.org/1465383003/diff/140001/net/test/android/javatests/AndroidManifest.xml File net/test/android/javatests/AndroidManifest.xml (right): https://codereview.chromium.org/1465383003/diff/140001/net/test/android/javatests/AndroidManifest.xml#newcode12 net/test/android/javatests/AndroidManifest.xml:12: <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> Does it need ...
5 years ago (2015-12-02 16:00:08 UTC) #14
jbudorick
+thakis for base/BUILD.gn and base/base.gyp https://codereview.chromium.org/1465383003/diff/140001/net/test/android/javatests/AndroidManifest.xml File net/test/android/javatests/AndroidManifest.xml (right): https://codereview.chromium.org/1465383003/diff/140001/net/test/android/javatests/AndroidManifest.xml#newcode12 net/test/android/javatests/AndroidManifest.xml:12: <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> On ...
5 years ago (2015-12-03 00:03:44 UTC) #16
mef
lgtm
5 years ago (2015-12-03 00:16:44 UTC) #17
Nico
lgtm
5 years ago (2015-12-03 02:01:35 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1465383003/160001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1465383003/160001
5 years ago (2015-12-03 03:51:40 UTC) #21
commit-bot: I haz the power
Try jobs failed on following builders: android_chromium_gn_compile_rel on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/android_chromium_gn_compile_rel/builds/165556)
5 years ago (2015-12-03 04:16:58 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1465383003/240001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1465383003/240001
5 years ago (2015-12-15 15:16:44 UTC) #26
commit-bot: I haz the power
Committed patchset #13 (id:240001)
5 years ago (2015-12-15 15:22:12 UTC) #27
commit-bot: I haz the power
Patchset 13 (id:??) landed as https://crrev.com/06215e9286247b08ff6c958f725c6e5185c4acd1 Cr-Commit-Position: refs/heads/master@{#365254}
5 years ago (2015-12-15 15:23:47 UTC) #29
Nico
https://codereview.chromium.org/1465383003/diff/240001/build/get_landmines.py File build/get_landmines.py (right): https://codereview.chromium.org/1465383003/diff/240001/build/get_landmines.py#newcode31 build/get_landmines.py:31: # landmine. Did you see this? In general, you ...
5 years ago (2015-12-15 15:29:06 UTC) #30
jbudorick
https://codereview.chromium.org/1465383003/diff/240001/build/get_landmines.py File build/get_landmines.py (right): https://codereview.chromium.org/1465383003/diff/240001/build/get_landmines.py#newcode31 build/get_landmines.py:31: # landmine. On 2015/12/15 15:29:06, Nico wrote: > Did ...
5 years ago (2015-12-15 15:31:48 UTC) #31
danakj
5 years ago (2015-12-15 20:09:47 UTC) #32
Message was sent while issue was closed.
A revert of this CL (patchset #13 id:240001) has been created in
https://codereview.chromium.org/1526183002/ by danakj@chromium.org.

The reason for reverting is: Android compile failing with related error:
https://code.google.com/p/chromium/issues/detail?id=569991.

Powered by Google App Engine
This is Rietveld 408576698