Commit graph

154 commits

Author SHA1 Message Date
Victoria Lease
f8c154f4b0 Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev 2012-08-23 11:58:01 -07:00
Ying Wang
67f0292011 Allow target arch in tapas parameters.
For example:
$ tapas App1 App2 x86 userdebug

Change-Id: I19601a93484f70dac677d2d68033684db32e1321
2012-08-22 10:46:21 -07:00
Victoria Lease
1b296b4749 getsdcardpath, getscreenshotpath, getlastscreenshot
Added a few new functions to envsetup.sh:
- getsdcardpath() returns the sdcard path. This will be more useful
  when multiuser storage complicates the sdcard path.
- getscreenshotpath() returns the path to screenshots
- getlastscreenshot() adb pulls the most recently-taken screenshot

Change-Id: I851145088344dff6f1672f0a423201f3aa3e4390
2012-08-21 15:44:06 -07:00
Ying Wang
324c2b2073 Skip the top out directory in mgrep.
Change-Id: I0530b24179034f521dc2366588cdc906ef466750
2012-08-17 15:04:10 -07:00
Raghu Gandham
8da4310646 MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
2012-08-10 09:15:38 -07:00
Bruce Beare
42ced6d5e2 x86: cleanups for toolchain
The 4.4.3 TC was still being specified in one spot.
Also, no need to cross-set x86/ARM variables when buliding
for ARM/x86.

Change-Id: Icbb0f772a983a24dc10ccab0800d4b7bbd60a099
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2012-07-17 21:40:12 -07:00
Jean-Baptiste Queru
feec98b139 resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
2012-05-16 13:18:39 -07:00
H.J. Lu
402d7f3654 Use i686-linux-android-4.6 for x86 build
Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
2012-05-14 08:22:27 -07:00
Robert Greenwalt
0987f03d52 Add Development/scripts to path.
Adding a script to there and people thought it would be nice if it were
available/in seach path.

bug:4208971
Change-Id: I58475f5f0149cec2485dc5bc787b5fb3cc68ba0a
2012-04-27 10:02:37 -07:00
Jean-Baptiste Queru
a50ef1c124 Switch to new locations of toolchains
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
Ying Wang
08f5e9a54c Add back ARM_EABI_TOOLCHAIN.
ARM_EABI_TOOLCHAIN is still used by the kernel build.

Change-Id: I5cdad0b478c0836e06a2af567e4e212602da1f3b
2012-04-17 18:10:11 -07:00
David 'Digit' Turner
2056c25edd resolved conflicts for merge of 296e4828 to master
Change-Id: Iae41a458f1eed497119c3abe4bf27194821c075d
2012-04-17 14:50:47 +02:00
Mark D Horn
7d0ede730d Update gdbclient for x86 target
Check the Target Architecture to choose the correct
version of the gdb client.

Change-Id: I1d75df235a18e60c6a7142a95c93b0fce69ee736
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
2012-04-10 10:37:07 -07:00
Jing Yu
f5172c7564 Switch default gcc toolchain from 4.4.3 to 4.6.
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.

Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
2012-03-29 20:45:50 -07:00
Kenny Root
9bf081e910 Add hardware API libs and SSL engines to gdb path
Hardware API implementations and SSL engines are stored as a
subdirectory to the /system/lib directory. This makes it easier to debug
them with the "gdbclient" command.

Change-Id: If7c3c7ffbca87425aac85d527e44fbea3bb025ad
2012-03-26 12:39:25 -07:00
Scott Anderson
1a5fc95a4a Rename help function in envsetup.sh to be hmm
Bash has a built-in command "help" that is useful for getting
help on bash commands without wading through the bash man page
(e.g. "help test" will give you the syntax for those "if [ ]"
expressions).  Overwriting a built-in with a convenience function
is not good.

The function "hmm" was added recently that serves much the same
purpose as help.  It seems like a good idea to remove the new
"hmm" command and rename "help" to be "hmm" so we no longer
overwrite the built-in.

Change-Id: I2079b3e6a10715956ec077d31e817a939c6ee4a0
Signed-off-by: Scott Anderson <saa@android.com>
2012-03-07 17:15:06 -08:00
Jean-Baptiste Queru
cb8f66305c Revert "Point arm toolchain to the new gcc-4.6 one."
This reverts commit 1f87795eef.
2012-01-11 04:23:06 -08:00
Jing Yu
1f87795eef Point arm toolchain to the new gcc-4.6 one.
Tested build mysid-eng, sojus-eng, trygon-eng, yakju-eng.

Change-Id: I742cf9fcf2407b9098c99136d67161ecf062ac01

Conflicts:

	core/combo/TARGET_linux-arm.mk
2012-01-06 14:14:06 -08:00
Jeff Davidson
3203891750 Add hm/hmm/hmmm command.
Everyone always mixes up m/mm/mmm and may not know about the "help"
command; this seems to be a nice way to remind yourself. :)

Change-Id: I009c7f7891768a8605c06e8d16384a812e607438
2012-01-05 13:19:21 -08:00
Alon Albert
68895a9699 Add support for building specific modules with mmm using the following syntax:
Build all modules:       mmm dir
Build a single module:   mmm dir:module
Build multiple modules:  mmm dir:module1,module2
Or in other words:

Change-Id: If32770c19f03a4d460f32046a3dd06656e33ee11
2011-11-30 12:40:19 -08:00
Ben Cheng
2260c40bc7 Merge "Point OPROFILE_EVENTS_DIR to oprofile dir in source tree." 2011-11-28 14:57:21 -08:00
Ben Cheng
057fde14d1 Point OPROFILE_EVENTS_DIR to oprofile dir in source tree.
Otherwise oprofile will punt with the following error message when
processing results collected by perf events since the event descriptions
are not stored in the default location on the host.

profile: could not open unit mask description file
/usr/local/share/oprofile//arm/armv7/unit_masks

Change-Id: I4ff2f2a87546ed3606490596285fb3e466e8d661
2011-11-28 14:29:39 -08:00
Jeff Hamilton
293f9392ba Bypass alias for grep in the tapas command.
Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
2011-11-18 17:24:13 -06:00
Dianne Hackborn
227b9f8b9b Merge "Dev branch for ICS MR2." 2011-11-14 13:14:25 -08:00
Nick Kralevich
0ab21d3ed3 make gdbclient work on x86
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
2011-11-11 09:02:01 -08:00
Dianne Hackborn
6e4e1bbbc1 Dev branch for ICS MR2.
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
2011-11-10 15:19:51 -08:00
Kenny Root
bf8cf79f60 am 3146eb76: am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"
* commit '3146eb76cf193ce95f0f88a477b1c708a1b5cf9b':
  Avoid complaining about empty directories
2011-07-18 14:47:21 -07:00
Kenny Root
3146eb76cf am 1708a6f7: am 4880b436: am 62a2b188: Merge "Avoid complaining about empty directories"
* commit '1708a6f74bf36ad6d520476895695c26bdaf7306':
  Avoid complaining about empty directories
2011-07-18 13:48:43 -07:00
Kenny Root
4880b43665 am 62a2b188: Merge "Avoid complaining about empty directories"
* commit '62a2b1882fb95e960b5889b46fe8f669ddc7c8ac':
  Avoid complaining about empty directories
2011-07-18 13:45:15 -07:00
Kenny Root
7546d613af Avoid complaining about empty directories
Change-Id: If46bffd1c4e6b94f2e476b2d7d506ef337bbf8e1
2011-07-18 13:12:31 -07:00
Kenny Root
b080a7392c am 1b61d1ba: am db549686: am 099aa4cf: am b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit '1b61d1ba7b7f2c0017193bcfc3a28e30af1ce603':
  Only include "[a-z]*.bash" files for completion
2011-07-18 12:06:40 -07:00
Kenny Root
1b61d1ba7b am db549686: am 099aa4cf: am b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit 'db5496867968fe592de807e606dc11287ca61c6a':
  Only include "[a-z]*.bash" files for completion
2011-07-18 12:01:29 -07:00
Kenny Root
099aa4cf4d am b8a1c89b: Merge "Only include "[a-z]*.bash" files for completion"
* commit 'b8a1c89b3a848ea343c897b33e77455dc2f98119':
  Only include "[a-z]*.bash" files for completion
2011-07-18 11:54:15 -07:00
Kenny Root
85cb556e2e Only include "[a-z]*.bash" files for completion
Some people were using case-insensitive filesystems which broke when
including simply [a-z]* since it matched the uppercase files. Use this
to filter only the actual bash scripts.

Change-Id: Ibfdcf2c091a154f0485545537a044667783a19f7
2011-07-18 11:15:31 -07:00
Kenny Root
50bab23178 resolved conflicts for merge of 5cc2e94f to master
Change-Id: I7707603ae64fa3e4371fab2e81aab7ec37e69d33
2011-07-15 15:14:51 -07:00
Kenny Root
5cc2e94fa8 am cb255e51: am 8985d033: am 88dcfccb: Merge "Add bash completion to envsetup"
* commit 'cb255e514093eaa839b1ac2487bdc2ec60797415':
  Add bash completion to envsetup
2011-07-15 14:55:26 -07:00
Kenny Root
8985d03378 am 88dcfccb: Merge "Add bash completion to envsetup"
* commit '88dcfccb5b064735177e1a87f578d6c734b47bc7':
  Add bash completion to envsetup
2011-07-15 14:50:05 -07:00
Kenny Root
52aa81cab9 Add bash completion to envsetup
Change-Id: I0b4d74e72deede42d7e5f229593d79417f16bb55
2011-07-15 11:22:31 -07:00
Jeff Brown
e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
Ji-Hwan Lee
752ad06eec Prevent "::" in PATH on multiple lunch
Running lunch multiple times results in inserting "::" each time.
"::" is an empty path element, which is treated as a current directory.

Change-Id: I770f4c1f40224ea91fd7989b0ea47d3cd081c24f
2011-07-04 14:09:47 +09:00
Raphael
ecb957705c resolved conflicts for merge of 732936d9 to master
Change-Id: I1fc667057aebbbef19bde746ebcc650ac0e8c35c
2011-06-23 13:52:29 -07:00
Raphael Moll
8b40cbfe29 am de50d0ab: am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit 'de50d0ab2008cbf836dc4fcbe9131a2071265946':
  Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-23 08:16:38 -07:00
Raphael
732936d99a resolved conflicts for merge of 8508a073 to honeycomb-plus-aosp
Change-Id: I376928881adb0e9fd62fabc1e21542bf0d700ca2
2011-06-22 14:35:32 -07:00
Raphael Moll
de50d0ab20 am d6605405: am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit 'd66054056311a369a090cd1aae2557454fdc7ecc':
  Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:44:52 -07:00
Raphael Moll
8508a07352 am 6e65ddb2: am cb84196f: Merge "Lunch: don\'t use a toolchain that doesn\'t exist."
* commit '6e65ddb20aa82522b3fdc72c87d365f22e9a43ed':
  Lunch: don't use a toolchain that doesn't exist.
2011-06-22 10:40:08 -07:00
Raphael Moll
d660540563 am 7f5a314a: am 169c19cc: Merge "Envsetup: Cygwin doesn\'t have \'ps -o command\'."
* commit '7f5a314ab6dacb72eb37c87e064b21dbd44ccc7b':
  Envsetup: Cygwin doesn't have 'ps -o command'.
2011-06-22 10:40:01 -07:00
Brett Chabot
5ee8418985 Revert mistakenly committed debug statement.
Change-Id: Iee6369002ba984821c889c7c0a92db061dc21355
2011-06-21 22:25:01 -07:00
Raphael Moll
c639c787a0 Lunch: don't use a toolchain that doesn't exist.
"lunch sdk-eng" on cygwin tries to use a gcc.exe from the
prebuild arm toolchain, but it doesn't exist. This prevents
from setting variables to point on a gcc toolchain if there
is none for the given arch.

Change-Id: I3b72220663687f9fdaacc050899aef00632f2c3c
2011-06-21 06:11:05 -07:00
Raphael Moll
70a86b0fb7 Envsetup: Cygwin doesn't have 'ps -o command'.
Running build/envsetup.sh on cygwin always shows a
warning since there is no 'ps -o command' option.
Bash already sets SHELL=/bin/bash so we can rely on that if present.

Change-Id: I145b42508985735ba61d2b53b216ecc56e321943
2011-06-20 16:03:14 -07:00
Brett Chabot
a04dd5eef5 Add layoutlib-tests to sdk build.
Change-Id: I9087da4484b23f8eb0602210006038a395047a79
2011-06-17 16:57:04 -07:00