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

Issue 15028013: Use $ANDROID_TOOLCHAIN set by envsetup.sh in adb_gdb and gdb_apk (Closed)

Created:
7 years, 7 months ago by Xianzhu
Modified:
7 years, 7 months ago
Reviewers:
navabi1, Yaron, digit1
CC:
chromium-reviews, craigdh+watch_chromium.org, bulach+watch_chromium.org, yfriedman+watch_chromium.org, ilevy-cc_chromium.org, klundberg+watch_chromium.org, frankf+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

Use $ANDROID_TOOLCHAIN set by envsetup.sh in adb_gdb and gdb_apk After recent upgradation to third_party/android_tools/ndk, there is no linux-x86 toolchain directory any more, but linux-x86_64 instead. This causes failure of adb_gdb and gdb_apk which hard-coded linux-x86 in the scripts. As envsetup.sh already set correct $ANDROID_TOOLCHAIN, now use it in the scripts instead of the hardcoded one. BUG=none NOTRY=true (presubmit passed) Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=199567

Patch Set 1 : #

Patch Set 2 : Rebased on https://codereview.chromium.org/14858018/ (r199234) #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1 line, -49 lines) Patch
M build/android/adb_gdb View 1 3 chunks +0 lines, -48 lines 0 comments Download
M build/android/gdb_apk View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 9 (0 generated)
Xianzhu
7 years, 7 months ago (2013-05-09 18:45:13 UTC) #1
Yaron
I think Martin already fixed this: https://codereview.chromium.org/14858018/
7 years, 7 months ago (2013-05-09 19:01:25 UTC) #2
Xianzhu
On 2013/05/09 19:01:25, Yaron wrote: > I think Martin already fixed this: https://codereview.chromium.org/14858018/ Would you ...
7 years, 7 months ago (2013-05-09 19:57:02 UTC) #3
Xianzhu
ping...
7 years, 7 months ago (2013-05-10 16:32:11 UTC) #4
Yaron
lgtm
7 years, 7 months ago (2013-05-10 17:16:34 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/15028013/7001
7 years, 7 months ago (2013-05-10 17:18:21 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/wangxianzhu@chromium.org/15028013/7001
7 years, 7 months ago (2013-05-10 17:22:12 UTC) #7
commit-bot: I haz the power
Change committed as 199567
7 years, 7 months ago (2013-05-10 23:14:38 UTC) #8
digit1
7 years, 7 months ago (2013-05-13 08:27:24 UTC) #9
Message was sent while issue was closed.
Sorry, I was on vacation and didn't see this.

I'm pretty sure we want to get rid of build/android/envsetup.sh and replace this
with a script like build/gyp_chromium that doesn't modify the environment. This
change will make this even more difficult.

I think we should have instead changed the logic to detect both 64-bit and
32-bit toolchain binaries properly. I'll upload a new patch later to do that
properly then.

Powered by Google App Engine
This is Rietveld 408576698