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

Issue 1211653002: [Android] Make dex exclude paths relative to output dir. (Closed)

Created:
5 years, 6 months ago by mikecase (-- gone --)
Modified:
5 years, 5 months ago
Reviewers:
cjhopman
CC:
chromium-reviews, jbudorick+watch_chromium.org, jbudorick, klundberg+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] Make dex exclude paths relative to output dir. Having a problem where the paths to exclude when dexing aren't being properly matched. For example, I will have '../../out/Debug/example/example.jar' in my --excluded-paths list, but '../../../out/Debug/example/example.jar' in the paths to dex and they won't be matched. This came about when I tried making an uiautomator instrumentation apk that did not share the same root as the apk under test. BUG= Committed: https://crrev.com/4f9c80736b16fc000e97edc0a1fd05fa896e8833 Cr-Commit-Position: refs/heads/master@{#336651}

Patch Set 1 #

Patch Set 2 : Changed paths to be relative to output dir. #

Total comments: 1

Patch Set 3 : Default output_dir to cwd (and remove change to internal_rules.gni) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+10 lines, -2 lines) Patch
M build/android/dex_action.gypi View 1 1 chunk +1 line, -0 lines 0 comments Download
M build/android/gyp/dex.py View 1 2 3 chunks +9 lines, -2 lines 0 comments Download

Messages

Total messages: 12 (3 generated)
mikecase (-- gone --)
5 years, 6 months ago (2015-06-24 20:37:26 UTC) #2
cjhopman
On 2015/06/24 20:37:26, mikecase wrote: Hm, I think that things running/writing in the output directory ...
5 years, 6 months ago (2015-06-25 22:57:48 UTC) #3
mikecase (-- gone --)
Changed so the paths stored in the out/Debug/example_apk/classes.dex.inputs are relative to the output dir like ...
5 years, 6 months ago (2015-06-26 22:41:06 UTC) #4
cjhopman
https://codereview.chromium.org/1211653002/diff/20001/build/android/gyp/dex.py File build/android/gyp/dex.py (right): https://codereview.chromium.org/1211653002/diff/20001/build/android/gyp/dex.py#newcode45 build/android/gyp/dex.py:45: help='Path to the output build directory.') I would maybe ...
5 years, 6 months ago (2015-06-26 22:52:58 UTC) #5
cjhopman
Oh right, gyp does actions strangely. The action is actually run in the directory of ...
5 years, 6 months ago (2015-06-26 22:53:07 UTC) #6
cjhopman
lgtm
5 years, 6 months ago (2015-06-26 22:53:14 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1211653002/40001
5 years, 5 months ago (2015-06-29 20:24:44 UTC) #10
commit-bot: I haz the power
Committed patchset #3 (id:40001)
5 years, 5 months ago (2015-06-29 21:36:39 UTC) #11
commit-bot: I haz the power
5 years, 5 months ago (2015-06-29 21:37:37 UTC) #12
Message was sent while issue was closed.
Patchset 3 (id:??) landed as
https://crrev.com/4f9c80736b16fc000e97edc0a1fd05fa896e8833
Cr-Commit-Position: refs/heads/master@{#336651}

Powered by Google App Engine
This is Rietveld 408576698