Commit Graph

289 Commits

Author SHA1 Message Date
Ying Wang 703709dba4 am baad790d: am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit 'baad790de671f680d6584edc4712a9cde823f49c':
  Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:42:52 +00:00
Ying Wang baad790de6 am f27e3fb4: am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh."
* commit 'f27e3fb4cf1d51f3abd5261d5626997c71df22b7':
  Allow symlinks to device or vendor tree in envsetup.sh.
2014-07-10 00:16:48 +00:00
Ying Wang 506410a549 Allow symlinks to device or vendor tree in envsetup.sh.
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
2014-07-09 15:37:34 -07:00
Ying Wang dcc8b3729d Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

Change-Id: I6095c7ccf0660ba7b17a659f5df29b05e50e6303
2014-07-01 10:58:10 -07:00
Ying Wang 3e164be71d am 556efe00: am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-a
* commit '556efe002f852dfa5ca5331e92b1d65a32339f26':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:39:28 +00:00
Ying Wang 556efe002f am 9e05c9e4: am dc58c2a6: Merge "Remove nonexistent from /buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.repo/repo:/buildbot/automergers/mirror-aosp-master-to-stage-aosp-master/.r
* commit '9e05c9e4e642673dc6d9104c44d26810773c382d':
  Remove nonexistent $ANDROID_QTOOLS from $PATH.
2014-06-30 17:36:39 +00:00
Ying Wang 2a859d5a62 Remove nonexistent $ANDROID_QTOOLS from $PATH.
Bug: 15983070
Change-Id: Id3807a6dabd616ae06aafc2b894c1858e4400e26
2014-06-30 10:25:33 -07:00
Ed Heyl c6d11f8c66 no color output, thanks Mac; better callback to real make
Change-Id: Iff2a15ed8aad28c264209b26a33d1206ec80b794
2014-06-27 14:19:51 -07:00
Colin Cross a58f8e04c9 build: fix vendor symbols in gdb
Set TARGET_OUT_VENDOR_SHARED_LIBRARIES_UNSTRIPPED
Append '64' for 64-bit libraries

Change-Id: Ief289bb23950d4bed84cf616cff6038fbd8caf95
2014-06-27 10:48:22 -07:00
Michael Wright 49753f8fa1 am e75101af: am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit 'e75101afdfc528aed486adbc0170964d1b32a91d':
  Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:42:54 +00:00
Michael Wright e75101afdf am e49d461a: am b0c6ea9f: Merge "Invoke debuggerd64 when appropriate with stacks."
* commit 'e49d461a8f713e61ad39ba20b48d2b5fee7beafe':
  Invoke debuggerd64 when appropriate with stacks.
2014-06-25 01:36:16 +00:00
Michael Wright b0c6ea9f29 Merge "Invoke debuggerd64 when appropriate with stacks." 2014-06-23 21:50:22 +00:00
Michael Wright aeed721fcc Invoke debuggerd64 when appropriate with stacks.
Read out the ELF header to see if the executable is 64-bit or 32-bit,
then call the appropriate debuggerd. In bash. Ugh.

Change-Id: I6550fe92e775659cd0370bcb70f40dd59238ad8f
2014-06-24 18:06:11 -07:00
Elliott Hughes 7df87a04f9 am dde1a37e: am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
* commit 'dde1a37eb61a807af666c2adcfcb7c197465da90':
  Updated gdbclient path support.
2014-06-23 19:54:11 +00:00
Elliott Hughes dde1a37eb6 am fbc6f257: am c04b4455: Merge "Updated gdbclient path support."
* commit 'fbc6f25712362b1f9b7b8970a96833ed0be0f12c':
  Updated gdbclient path support.
2014-06-23 19:48:57 +00:00
Ying Wang 267a928deb am e9ef4005: am cd66e5ca: am 6a8b3b43: Merge " delete duplicate variable definition"
* commit 'e9ef4005ea41b757bf1381236acaae124110d9fb':
  delete duplicate variable definition
2014-06-23 17:01:38 +00:00
Ying Wang e9ef4005ea am cd66e5ca: am 6a8b3b43: Merge " delete duplicate variable definition"
* commit 'cd66e5ca0a8ab3235b5a49c904a692ff9142999e':
  delete duplicate variable definition
2014-06-23 16:57:53 +00:00
Ed Heyl cc6be0a369 wrap make and print success/failure message, more later
Change-Id: I48a4687d81bc4b950a1be42b34d2f0d76733574a
2014-06-23 15:10:49 +00:00
Elliott Hughes c04b445568 Merge "Updated gdbclient path support." 2014-06-20 21:00:34 +00:00
Brigid Smith 7a569a6282 Updated gdbclient path support.
Now gdbclient accepts a fully qualified pathname for EXEs, which it will
not modify, or a relative pathname, to which it will prefix
"/system/bin".  As an example, each of the following now works.

Fully qualified:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient /system/bin/ping :5039 /system/bin/ping

Relative:
adb shell gdbserver :5039 /system/bin/ping
bg
gdbclient ping :5039 /system/bin/ping

Change-Id: I1e4c9fca64c4fbc52c255271cc7f83f35c258509
2014-06-20 14:12:42 -07:00
Ying Wang 6a8b3b43bb Merge " delete duplicate variable definition" 2014-06-20 21:00:34 +00:00
Elliott Hughes 1a03ddb805 am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '09a4cac12e3b040fb6d18490ff444b2fdd6cb451':
  Removed /system/bin prefix from gdbclient.
2014-06-18 00:55:33 +00:00
Elliott Hughes 9b0bae3b37 am 1a03ddb8: am 09a4cac1: am 7cc3174d: Merge "Removed /system/bin prefix from gdbclient."
* commit '1a03ddb805f2efc45345aa545d1d724e75972ae7':
  Removed /system/bin prefix from gdbclient.
2014-06-18 01:54:56 +00:00
Brigid Smith 0a2712d349 Removed /system/bin prefix from gdbclient.
Now a program run through gdbclient will not automatically have
/system/bin added to its path, so programs not in /system/bin will no
longer need to be prefixed with ../../.

The following now works as an example:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient /system/xbin/crasher :5039 /system/xbin/crasher

And the following now no longer works:
 adb shell gdbserver :5039 /system/xbin/crasher
 bg
 gdbclient ../../system/xbin/crasher :5039 /system/xbin/crasher

Change-Id: I299b66d03915aeb1dc300e43a81c9a51f0bd7dec
2014-06-17 15:42:54 -07:00
Andrey Belous a2b0f685bb delete duplicate variable definition
CALLED_FROM_SETUP and BUILD_SYSTEM set in get_build_var before make execution
no need to set them before calling get_build_var function

Change-Id: Ia79e11e5e3aa5c7fd337b989c16d50750b6c1442
Signed-off-by: Andrey Belous <belous.andrey@gmail.com>
2014-06-11 14:00:55 -04:00
Ying Wang 21e9474252 am b541ab6c: Support to build 64-bit unbundled binaries.
* commit 'b541ab6c51734530ed615e307f8912f32e616967':
  Support to build 64-bit unbundled binaries.
2014-05-30 01:02:44 +00:00
Ying Wang b541ab6c51 Support to build 64-bit unbundled binaries.
Change-Id: I4656c983d60aaf535ce4d14528c28ae8cef98fd8
2014-05-29 17:57:40 -07:00
Ed Heyl d9686fbb8c Revert, strange side affects to other (like lunch) commands.
This reverts commit 6acfdd62de.

Change-Id: Ic0a84700912570ddec70d152767a9d40f8fa71b0
2014-05-28 19:32:45 +00:00
Ed Heyl 6acfdd62de wrap make and print success/failure message, more later
Change-Id: I7debc62babcd855a2d6355dddd00f4531050151c
2014-05-28 11:14:35 -07:00
Colin Cross 949ed75bb9 am 423242b5: am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '423242b59ea01dffbb7f79c7c045528f7c351c4b':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
2014-05-22 19:40:46 +00:00
Colin Cross 423242b59e am 828b5183: am e45c8607: Merge changes Ibc943b75,Ib4ccf373,I30ff439b,I7bde0130
* commit '828b518377f69516ea6cbb9ad160d81ced6980d5':
  set a prebuilt directory name for the 2nd arch
  add vendor directories to gdb shared library search path
  add 2nd arch gcc to the path
  fix paths when 2nd arch gcc is a different version
2014-05-22 19:36:15 +00:00
Colin Cross 3655a68565 add vendor directories to gdb shared library search path
Change-Id: Ib4ccf3739d6b2f14597605ce06f00e4776f67976
2014-05-22 12:01:06 -07:00
Colin Cross 6a5fa0684a add 2nd arch gcc to the path
Add the 2nd arch gcc to the path so users can manually run gdb,
addr2line, objdump, etc.

Change-Id: I30ff439bb6548b897d13bfa87151991d5f2948b3
2014-05-22 12:01:06 -07:00
Colin Cross 03b424a50b fix paths when 2nd arch gcc is a different version
arm64 is using gcc 4.9, arm is using gcc 4.8.  Fix setpaths() to
get a separate version for the 2nd arch.

Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
2014-05-22 12:01:06 -07:00
Christopher Ferris 5b7030390f am bcbf9ae4: am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."
* commit 'bcbf9ae4de41b2cd98ef96f61066496030ef31a1':
  Fix extra/missing : in path setup.
2014-05-21 00:01:44 +00:00
Christopher Ferris bcbf9ae4de am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."
* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
  Fix extra/missing : in path setup.
2014-05-20 23:40:00 +00:00
Christopher Ferris 7110f241ab Fix extra/missing : in path setup.
Change-Id: I4d95efc781c58af704012922d95841e009bf6286
2014-05-20 14:09:36 -07:00
Ji-Hwan Lee 6772438d92 am fff1b6d8: am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit 'fff1b6d80002d83c0db5c426961780f58b7391df':
  Put prebuilt emulator path after host output
2014-05-18 07:58:12 +00:00
Ji-Hwan Lee fff1b6d800 am 744e4aa2: am e624fd28: Merge "Put prebuilt emulator path after host output"
* commit '744e4aa228b4ad25d444acb020ee3816fd2c2eb1':
  Put prebuilt emulator path after host output
2014-05-18 07:18:27 +00:00
Ji-Hwan Lee 9f5d3dde17 Put prebuilt emulator path after host output
So that built emulator is used instead of prebuilt one when
BUILD_EMULATOR=true.

Change-Id: I67dfbfc2c3bf9bf051e56de425caa07b08d4b2e4
2014-05-15 22:03:08 +09:00
David 'Digit' Turner edc702c7d6 am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:28:16 +00:00
David 'Digit' Turner 873782ccd4 am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
* commit '9e3259f50d6aa2ca4430430d71d2fffd58662650':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
2014-05-11 09:23:35 +00:00
David 'Digit' Turner 94d16e5a0f envsetup.sh: Use prebuilt emulator binaries if available.
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.

See https://android-review.googlesource.com/#/c/93399/
for a related patch that adds the binaries.

BUG=13747402

Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
2014-05-09 15:32:32 +02:00
David 'Digit' Turner 7cde030346 envsetup.sh: Use prebuilt emulator binaries if available.
This patch changes the setpaths() function in envsetup.sh to probe
for prebuilts/android-emulator/<host>/, and prepend it to PATH if
it exists.

See https://googleplex-android-review.googlesource.com/#/c/459741/
for a related patch that adds the binaries.

BUG=13747402

Change-Id: I30794ea52f6dfc58908e6271f2c0da8e2f0b68e8
2014-05-05 16:13:50 +02:00
Narayan Kamath 7d26e97e7f am 3f1d1608: am 475a3d17: Merge "Use java_home to determine jdk location."
* commit '3f1d1608ebc4a0c307c94b67943bee004d8428a1':
  Use java_home to determine jdk location.
2014-04-30 15:37:38 +00:00
Jason Parks 30cfbd756b Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.

(cherry-picked from commit 13b2e19ef2)

Change-Id: Ie2c08d35fcff2129b26c1dfa8a2e5cd7b19c4b49
2014-04-30 11:43:00 +01:00
Jason Parks 13b2e19ef2 Use java_home to determine jdk location.
Specifying the major version rather than hard coding
to a minor version.

Change-Id: Ieccec98c1b41e3eb7f512bcebc83f6034d634862
2014-04-28 13:32:38 -05:00
Torne (Richard Coles) 0b1204753e am 93d0245b: am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '93d0245bc9cebf68a677d59b2ada1f72f9ea2dd2':
  Fix PATH setup for arm64.
2014-04-28 16:12:00 +00:00
Torne (Richard Coles) 93d0245bc9 am 5646d2f6: am 7250b63a: Merge "Fix PATH setup for arm64."
* commit '5646d2f6aa851ca79440d573e73fa51cf6afaf81':
  Fix PATH setup for arm64.
2014-04-28 16:06:24 +00:00
Torne (Richard Coles) f24c356a96 Fix PATH setup for arm64.
On architectures other than "arm", the combination of
ANDROID_KERNEL_TOOLCHAIN_PATH being empty, and CODE_REVIEWS being empty,
leads to adding a :: into the user's PATH, which is highly undesirable.

Neither CODE_REVIEWS nor the mips toolchaindir is ever used, so just
remove them, and make sure we only include the extra colon when setting
the kernel toolchain path to a non-empty value.

Change-Id: I2dfa7d3a322b56b6abbc47476082dc6ae4dd6a82
2014-04-28 15:25:21 +01:00