Commit graph

382 commits

Author SHA1 Message Date
Dan Albert
023fd1fca8 am e98755f9: Merge "Add a SANITIZE_HOST flag."
* commit 'e98755f9d6619ff141d099f9da655d141da72b8e':
  Add a SANITIZE_HOST flag.
2014-12-09 13:18:44 +00:00
Dan Albert
4ae5d4b331 Add a SANITIZE_HOST flag.
We had discussed the idea of making all host tools default to using
ASAN. Even if we don't make it the default, this makes it easy for the
user to switch all host binaries over.

Change-Id: I64a5c741b1b4e9aefed3a6be8dcd4f386e06b29c
2014-12-05 22:20:37 -08:00
Dan Albert
fc0d1e6f58 am 0616000d: Merge "Make cgrep check .hpp files as well."
* commit '0616000d09905ac423dae0ffccdb0ef3fe24f36d':
  Make cgrep check .hpp files as well.
2014-11-22 20:57:19 +00:00
Dan Albert
019611958f Make cgrep check .hpp files as well.
Change-Id: Ie8e9ce7270233ac01d7bc80bda5adc28afa158ed
2014-11-22 10:16:01 -08:00
Dan Albert
becb42cafa am fbb553dc: Merge "Colorize build success/failure message."
* commit 'fbb553dcd8a1cc65a7b2f56fca7604d5850f59c8':
  Colorize build success/failure message.
2014-11-17 19:44:17 +00:00
Dan Albert
fbb553dcd8 Merge "Colorize build success/failure message." 2014-11-17 19:34:11 +00:00
Dan Albert
b59995d0cd Colorize build success/failure message.
Change-Id: I8901689876e65f5b72050c40e1580f167e49c2b0
2014-11-14 22:37:46 -08:00
Dmitriy Ivanov
11b4800be5 am dd20e68d: Merge "Fix device detection and path to tapas"
* commit 'dd20e68d8c37b28be86f2c2a5be8350ec35dd814':
  Fix device detection and path to tapas
2014-11-14 17:58:57 +00:00
Dmitriy Ivanov
8cde5289a4 Fix device detection and path to tapas
1. Some devices do not set ro.product.device in which
    case take it from ro.hardware

 2. Add path to tapas symbols to sysroot and solib-search-path
    for tapas users only

Change-Id: I4eed2d3c3aefd95070beebdbfba4464a524c3066
2014-11-13 19:46:43 -08:00
Nick Kralevich
3f49047534 am 1b7f0f8c: am a94282c6: Mount tmpfs on /cores
* commit '1b7f0f8c1def705e255242780ef72090061237ac':
  Mount tmpfs on /cores
2014-11-05 05:21:19 +00:00
Iliyan Malchev
e04299a84c am 854252d2: am af5de97b: rename coredump-* --> coredump_*
* commit '854252d2957c792ce19aba6c3b99194abb688a07':
  rename coredump-* --> coredump_*
2014-11-05 05:13:22 +00:00
Nick Kralevich
a94282c659 Mount tmpfs on /cores
Proper selinux labeling support for files on rootfs was
never completely implemented. Instead of putting coredump
files on rootfs, put them on tmpfs instead.

See: http://www.mail-archive.com/seandroid-list@tycho.nsa.gov/msg01815.html

Bug: 18227650
Change-Id: I2eeabee4fe1a14bfbf990a4a518d538d6b4b6e87
2014-11-05 05:03:45 +00:00
Iliyan Malchev
af5de97b8a rename coredump-* --> coredump_*
b/18229600 shamu kernel is failing to build on build machine

Change-Id: Ia67443853443e4d7db9311bf8da69a5dc0da8e5e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-04 21:01:18 -08:00
Justin Morey
c32d5a31f8 am fc133135: am 29d225c9: Set a default value for TARGET_BUILD_DENSITY
* commit 'fc13313551dec50e60fbed36f64b08dbfe5bf888':
  Set a default value for TARGET_BUILD_DENSITY
2014-11-04 20:09:32 +00:00
Justin Morey
29d225c992 Set a default value for TARGET_BUILD_DENSITY
If no density value is specified when invoking tapas, we now export
a default value of 'alldpi'

Change-Id: I12b22a4cbd0ef604826aad66c5f7ab9271eb6d57
2014-11-04 13:35:51 -06:00
Iliyan Malchev
9315262884 am eaf5b7bb: build: rename coredump-setup --> coredump_setup automerge: e675cfb
* commit 'eaf5b7bb06d92efab0c0779d38dd3b040497f51e':
  build: rename coredump-setup --> coredump_setup
2014-11-04 02:50:27 +00:00
Iliyan Malchev
e675cfbfb9 build: rename coredump-setup --> coredump_setup
b/18229600 shamu kernel is failing to build on build machine
Change-Id: I1b7e6d0ebf3e966a89ae4c7fed0cfd2db3f0a6a9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-11-04 01:08:31 +00:00
Dmitriy Ivanov
4e44183f54 am 8d7f2e62: am bd0e8af7: Merge "Replacement for gdbclient"
* commit '8d7f2e6289ebb7e7d7a72cc3cf581b1e4ad23acf':
  Replacement for gdbclient
2014-11-01 02:24:53 +00:00
Dmitriy Ivanov
8d7f2e6289 am bd0e8af7: Merge "Replacement for gdbclient"
* commit 'bd0e8af734d5b6e28e2710bf53beb1b674e3fdb2':
  Replacement for gdbclient
2014-11-01 01:17:51 +00:00
Dmitriy Ivanov
fd0f1c848f Replacement for gdbclient
Differences between this implementation and the old one:
 1. Resolves symbols/gdb based on device information (lunch
    target is irrelevant)
 2. Works with downloaded from build-server symbols
 3. Does not require user to specify exe file - detects it automatically

Bug: 18208329

(cherry picked from commit 9b8e4b3772)

Change-Id: I13ae2debb6e2d827b9aa55e93864b5d60c2bd32e
2014-10-31 18:17:37 -07:00
Dmitriy Ivanov
9b8e4b3772 Replacement for gdbclient
Differences between this implementation and the old one:
 1. Resolves symbols/gdb based on device information (lunch
    target is irrelevant)
 2. Works with downloaded from build-server symbols
 3. Does not require user to specify exe file - detects it automatically

Change-Id: I4e7ce0a51868634593a9f104fe3f2fa67b54ca9f
2014-10-31 17:49:57 -07:00
Iliyan Malchev
2e835e714c am 2b756f79: am 248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '2b756f79461c3cc5c227dc83e6dd3f360ad3f247':
  envsetup.sh: add functions to enable and generate core dumps
2014-10-31 22:59:59 +00:00
Iliyan Malchev
248f4d53b3 envsetup.sh: add functions to enable and generate core dumps
The shell functions in this patch enable crashing processes with the core limit
set correctly to dump core in directory /cores.  They do so by remounting the
root partition, which is RAM-backed, and by creating the 0777-chmodded /cores
under it. They also set the core file pattern in /proc/sys/kernel/core_pattern
to be /cores/core.%p, such that a core dump will have the crashing process' PID
appended to it.  You enable core-dump generation once per boot, as follows:

	coredump-setup

If a process does not have its core-size rlimit set (as most do not), you can
either set it manually by typing "adb shell prlimit <pid> 4 -1 -1", or by
typing coredump-enable <name>, e.g.

	coredump-enable $(pid mediaserver)

Alternatively, you can cause a running process to dump core by sending it a
SIGSEGV via the shell function core <name>, e.g.:

	core $(pid mediaserver)

Change-Id: Ib174e7ee95515fb9866fa6bf0d5b5bf23f3ec61b
Signed-off-by: Iliyan Malchev <malchev@google.com>
2014-10-31 13:50:58 -07:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Neil Fuller
f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Jeff Hamilton
5069bd6bfa Add a density axis to tapas.
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.

Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit 7e3d2341570681e566872216796dc4f79c8695ef)
2014-10-23 18:30:01 +00:00
Neil Fuller
46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Christopher Ferris
855d27f629 Call art-on only when debugging ART processes.
If you are debugging a native process, SIGSEGV gets ignored by default.
Make it so that the special ART gdb macro is only called when debugging
app_processXX.

Bug: 17815162
Change-Id: Idba86860dfd94e7483f2668beeb76b3e6032fb34
2014-10-05 10:41:41 -07:00
Ying Wang
850ca0db5e Use "$@" to preserve argument word breaks
This fixes mmma broken due to quotes stripped in the argument passing.

(cherry picked from commit dcc8b3729d)

Change-Id: Ic8c4bb8e7cb347c1f80b5bc1648f63e58a010e8d
2014-09-22 17:13:08 +02:00
David 'Digit' Turner
d036711427 Merge "envsetup.sh: Fix handling of emulator prebuilts path." into lmp-dev 2014-09-16 19:33:37 +00:00
David 'Digit' Turner
50d5ccc1b2 envsetup.sh: Fix handling of emulator prebuilts path.
Due to a bad previous merge, everytime 'lunch' is called, a new
instance of prebuilts/android-emulator/<system>/ will be added
to your PATH.

This patch fixes the issue by removing the duplicate code that
should have been removed during the merge. Note that android-emulator
is still being added once to the PATH by code that appears before
in the script.

BUG=17524154

Change-Id: Iaa03159b0c81b15ef4c7c420e2f76e0a48aba789
2014-09-16 21:23:12 +02:00
Brian Carlstrom
0ff3aba580 Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957

(cherry picked from commit a5c4f178ae)

Change-Id: Id5f5a6e9c81d4332ef5a846423ea41384a053db6
2014-09-12 09:37:25 -07:00
Brian Carlstrom
0c837a093e Merge "Fix mma/mmma by making gettop canonicalize TOP when set" into lmp-dev 2014-09-12 16:36:21 +00:00
Brian Carlstrom
a5c4f178ae Fix mma/mmma by making gettop canonicalize TOP when set
Bug: 17253957
Change-Id: Ifd6d5984f63981e1f99b6ae6f9459c2801588459
2014-09-12 00:33:25 -07:00
Dan Albert
b7af531ecc Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
(cherry picked from commit de21059acf)
2014-09-11 13:48:15 -07:00
Dan Albert
de21059acf Remove the vbox target from the build system.
I've been told this is no longer in use, and it's the only user of
external/grub, which is distressingly out of date.

Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6
2014-09-10 15:10:31 -07:00
Ying Wang
ed21d4c016 Allow to overrde command make in envsetup.sh.
To override define function get_make_command() in vendor's
vendor-envsetup.sh.

Change-Id: I553e60816eb789750ccd16110f2e82a5087587e8
2014-08-24 22:14:57 -07:00
Jeff Brown
e29069dc0e Merge "Tweak sgrep to add cc and aidl files." into lmp-dev 2014-08-14 16:46:52 +00:00
Ed Heyl
9e7b9b996e wrap make and print success/failure message, more later
Change-Id: I48a4687d81bc4b950a1be42b34d2f0d76733574a
(cherry picked from commit cc6be0a369)
2014-08-09 17:33:05 -07:00
Duane Sand
3c4fcd8451 [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

(cherry picked from commit 6670e24aed)

Change-Id: I34d2f8fc6113c9d1670e3acff1aff48634b9fe1b
2014-08-05 12:28:44 -07:00
Jeff Brown
46cbd20098 Tweak sgrep to add cc and aidl files.
Also add it to the help list since it was missing.

Change-Id: I11403e63bc421fd146ad88452eac05043eacabc3
2014-07-26 15:19:21 -07:00
Duane Sand
6670e24aed [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Use 4.9 mips64el toolchain for both 64- and 32-bit builds.
Tell ld when 32-bit links are required.
Override 4.9's changed defaults for mips floating point
register use, to get same assembler rules as 4.8 and earlier.

Also: drop unused  soft-fp build targets, cleanout redundant
compiler options, and remove extraneous Android.mk file.

Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32
2014-07-23 14:16:00 -07:00
Nick Kralevich
9948b1e9ed runhat: use /data/local/tmp
Use /data/local/tmp for runhat reports, instead of the sdcard.
system_server isn't allowed to handle sdcard file descriptors, since
the sdcard could be ejected at any time, causing the kernel to kill the
system process.

This addresses the following SELinux denial:

  W/main    ( 9906): type=1400 audit(0.0:16): avc: denied { read write } for path="/mnt/shell/emulated/0/hprof-600" dev="fuse" ino=3077890536 scontext=u:r:system_server:s0 tcontext=u:object_r:fuse:s0 tclass=file

Bug: 16375996
Change-Id: I4c2053c327526c2f8e6812f4ed911a712ae9a9b8
2014-07-18 15:45:38 -07:00
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
Doug Zongker
0d8179e84b fix tapas to work in more shells
tapas with multiple app names currently works in bash but discards all
but the first app in others (specifically, zsh).  Use shell
constructions that are more universal.

Change-Id: I2f836ddf75b89019ac04ef99647d782ffe79cfee
2014-04-16 11:34:34 -07:00
Colin Cross
fa75d63cd7 am dbf1f804: am 80f7dbd4: Merge "gdbclient: use 64-bit suffix for all library symbols"
* commit 'dbf1f8047be813537ddaebd777adc242a34f8204':
  gdbclient: use 64-bit suffix for all library symbols
2014-04-10 20:20:09 +00:00
Colin Cross
84480ad0ee gdbclient: use 64-bit suffix for all library symbols
Correct the solib-search-path for 64-bit to look in /system/lib64
for all libraries including those in subdirectories.

Change-Id: I606a0eae1137a857564facc79306ad83097d9659
2014-04-10 12:51:39 -07:00
Jon Boekenoogen
0f2e5657d4 am 9ccadc82: am a8245d1d: Merge "ggrep" into klp-ub-dev
* commit '9ccadc8246c6c805265046ce02cb5e42c9cc2ee9':
  ggrep
2014-04-09 14:03:35 +00:00
Jon Boekenoogen
9ccadc8246 am a8245d1d: Merge "ggrep" into klp-ub-dev
* commit 'a8245d1dc1746a8cd26aead8c15aa05c9b703455':
  ggrep
2014-04-09 09:27:33 +00:00
Jon Boekenoogen
cbca56fb72 ggrep
Add ggrep to search Gradle files more easily. Similar
to jgrep, cgrep, mgrep, etc...

Change-Id: I9f0bc74560c1df4c369216eabdb9e825bcb6fe75
2014-04-07 21:05:38 +00:00
Narayan Kamath
c84889b80a Build with java7 by default.
All introduce a flag LEGACY_USE_JAVA6 to force java6 builds.
This is an unsupported configuration, and provided temporarily
to iron out regressions and compare build output (if required.).

- Increment the version check sequence number.
- Move a more specific check (OpenJDK vs non OpenJDK) after
  the more general version check.
- Update the link in the version check error message to the
  "initializing" page instead of the "download" page. The latter
  talks about repo, mainly.

bug: 8992787

Change-Id: I313e17b1911768d4f3bc318c4162c53dec6eaf0d

Conflicts:
	core/main.mk
2014-04-04 18:44:47 -07:00