Commit graph

197 commits

Author SHA1 Message Date
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
Ed Heyl
cedbd2f587 am eb27aa01: Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
* commit 'eb27aa01c87ed774cf5d71ce1c92d87575a08ad7':
  add ANDROID_HOST_OUT to env (please do not merge)
2011-06-16 13:17:08 -07:00
Ed Heyl
d23d0f0764 am ec664803: am c811f291: add ANDROID_HOST_OUT to env (please do not merge)
* commit 'ec6648036ef9e0d4fe25a4d4abbd79279d2ee9d0':
  add ANDROID_HOST_OUT to env (please do not merge)
2011-06-07 13:15:20 -07:00
Ed Heyl
4f2297debb add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5
2011-06-07 12:54:47 -07:00
Ed Heyl
c811f29198 add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: I97e49fcb2610344df1907ec17116ee6e8a586e38
2011-06-07 12:35:46 -07:00
Jean-Baptiste Queru
9fbea0ec1a am bdb72318: am 5372220a: Merge "Remove simulator from the lunch menu"
* commit 'bdb72318e47d38df2180bd00d0fd0a97bdc82255':
  Remove simulator from the lunch menu
2011-05-12 09:01:31 -07:00
Jean-Baptiste Queru
bdb72318e4 am 5372220a: Merge "Remove simulator from the lunch menu"
* commit '5372220a1a12a715ca1242dcc3f4b11b89a8387a':
  Remove simulator from the lunch menu
2011-05-12 08:52:59 -07:00
Jean-Baptiste Queru
b27cd8f802 Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
2011-05-11 10:40:43 -07:00
Grace Kloba
e9d04bf88b Enable gdbclient to accept both name and pid of the process
Change-Id: I10234ddb2e52de302818e1b5b27a8f35651c4395
2011-04-30 11:04:05 -07:00
Doug Zongker
2903498319 don't use bashism just to remove trailing ':'
Change-Id: I9f86baa65406ac547cee70a273eb730ca47df66b
2011-04-22 08:16:56 -07:00
Kristian Monsen
f6cb2d3ec9 Also remove the trailing : if it is present
Change-Id: Icdbc197803d0f759a4656a2bc2182216d14997b3
2011-04-15 16:19:48 +01:00
Mike Dodd
0c26d34269 Fix typo that broke cgrep.
Change-Id: Ic87f4bff1ee52a201c197c5664ff2e91648b0b53
2011-04-07 13:29:29 -07:00
Jeff Brown
8fd5cce411 Remove OPROFILE_EVENTS_DIR, add ANDROID_HOST_OUT.
Change-Id: I81b82fa2b7c754a2901dff124a36fe3b7b5abfd0
2011-03-31 20:08:54 -07:00
Chris Dearman
f0bcf429d9 Fix argument handling in runhat() function
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
2011-03-31 14:45:03 -07:00
Joe Onorato
f50e84bed9 Make jgrep, mgrep, etc not recurse into .repo and .git directories.
Change-Id: I6683146311b09f58154601f4a4eec6d26fb90450
2011-03-15 14:15:46 -07:00
David Turner
6b11b58a4a am dfa82c43: am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'dfa82c438f5557c5bae3b8f8ae2dc8444edc8036':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-05 09:20:33 -08:00
Bruce Beare
ba366c4fb3 x86: Add in the VirtualBox emulator as a separate build target
Change-Id: Icff81a757952b7652d171bc95773e177c4fd7772
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-03-01 13:04:21 -08:00
Ying Wang
015edd2c1b Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
2011-01-21 17:49:30 -08:00
Jean-Baptiste Queru
6c75cb3752 am 0332f0ac: Truly default to the full config. 2010-10-22 12:12:52 -07:00
Jean-Baptiste Queru
0332f0ac1e Truly default to the full config.
It is much better than generic for emulator-based work.

Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2010-10-22 10:03:49 -07:00
Romain Guy
b84049abc7 Add functions to press home, back and menu keys.
Change-Id: I54a28eb75463d5b5f8c9e2f216983aac67be0fa7
2010-10-05 10:29:35 -07:00
Brian Carlstrom
c43ac33bcc am 73143d9d: am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '73143d9dfcaca5416d46be2733bb370824b3acb2'

* commit '73143d9dfcaca5416d46be2733bb370824b3acb2':
  Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
2010-09-28 18:21:48 -07:00
Brian Carlstrom
73143d9dfc am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit 'ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp

* commit 'ea83daa389aea493294617232b5c34414861d701':
  Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
2010-09-28 17:50:49 -07:00
Brian Carlstrom
c634d2c19d Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
2010-09-28 13:44:39 -07:00
Ying Wang
880f9e1641 am 81fcba10: am 1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '81fcba102ea3953f525c1659914247747637ae7d'

* commit '81fcba102ea3953f525c1659914247747637ae7d':
  Don't set DISABLE_DEXPREOPT in lunch.
2010-09-27 21:28:20 -07:00
Ying Wang
81fcba102e am 1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp

* commit '1fdbf261a0d550baaed96f5461bb014754364c16':
  Don't set DISABLE_DEXPREOPT in lunch.
2010-09-27 16:33:43 -07:00
Ying Wang
1fdbf261a0 Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.

Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
2010-09-27 16:25:11 -07:00
Jeff Davidson
513d7a4021 Add tab completion for lunch.
Change-Id: I4ddfffe8fe4519665a5a66aa60990f900a9ba80a
2010-08-03 09:39:39 -07:00
Jing Yu
9d396e37ac Make arm-linux-androideabi toolchain the default for Android build.
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.

kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.

The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.

Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
2010-07-29 19:09:12 -07:00
Ying Wang
84a5ba03b4 am b96e8a8c: am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade'

* commit 'b96e8a8cc629c3e3a196263cc548bd55824e4ade':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:24:38 -07:00
Ying Wang
b96e8a8cc6 am d9dea715: am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp

* commit 'd9dea715e5841028b1a30aa3f357b05c9de3e8c7':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 11:06:26 -07:00
Ying Wang
d9dea715e5 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 10:58:14 -07:00
Ying Wang
0188414bc6 add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
2010-07-20 16:18:16 -07:00
The Android Open Source Project
79960bbaf0 am fa2d8ace: merge from open-source master
Merge commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208'

* commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208':
  Add full_x86 product.
2010-07-16 13:06:24 -07:00
The Android Open Source Project
fa2d8ace56 merge from open-source master
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
2010-07-16 13:03:44 -07:00
Jean-Baptiste Queru
6c2df3e98b Add full_x86 product.
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).

Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2010-07-15 14:04:39 -07:00
Andy McFadden
b628985c9b Update runhat command to use "am dumpheap".
Instead of sending a kill -10 to write a file to /data/misc, we now use
"am dumpheap" to create a file on /sdcard.

Also,
- Removed mention of unused "output-file" argument.
- Quoted args in initial tests so bash doesn't go nuts when you say
  "runhat" with no arguments.

Bug 2835170.

Change-Id: I614fdb54a1d6b8824bc9b568c07cc0901c41a3d4
2010-07-14 12:43:11 -07:00
The Android Open Source Project
f508e251ec am f47b0a17: merge from open-source master
Merge commit 'f47b0a1758a66277d11f362e307f0dd6c183051d'

* commit 'f47b0a1758a66277d11f362e307f0dd6c183051d':
  Add generic_x86-eng to the lunch menu
2010-07-12 15:06:02 -07:00
The Android Open Source Project
f47b0a1758 merge from open-source master
Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4
2010-07-12 14:58:14 -07:00
The Android Open Source Project
f3a98c0b2b am 93c63d57: merge from open-source master
Merge commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f'

* commit '93c63d5740cde483217fbbd2ee3c6b7223b3721f':
  Vendorsetup needs to look in additional places.
2010-07-12 14:50:28 -07:00
The Android Open Source Project
93c63d5740 merge from open-source master
Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6
2010-07-12 14:46:37 -07:00
Bruce Beare
6f9318e035 Add generic_x86-eng to the lunch menu
Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 13:55:18 -07:00
Bruce Beare
6f8410b976 Vendorsetup needs to look in additional places.
Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 10:31:21 -07:00
The Android Open Source Project
380d76104d am 47bc4e34: merge from open-source master
Merge commit '47bc4e3407326bc58bb171660af5ced4edb93608'

* commit '47bc4e3407326bc58bb171660af5ced4edb93608':
  Explicitly indicates that only bash is supported.
2010-07-09 14:31:43 -07:00
The Android Open Source Project
47bc4e3407 merge from open-source master
Change-Id: Ia02a590164d87ae98c714ac7d408ff7f241ae1fa
2010-07-09 14:28:20 -07:00
Kan-Ru Chen
074537668e Explicitly indicates that only bash is supported.
Remove all zsh compatibility code and related comments.

Display a warning when other shell is used, to prevent the illusion
that building under Zsh is supported when it's not.

Change-Id: Ie6d43ace3a30bde99aad45b00d25007ac28d5155
2010-07-08 10:04:39 +08:00
The Android Open Source Project
cb8eedc5c4 am 6069db77: merge from open-source master
Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'

* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
  Add full-eng instead of generic-eng in the lunch menu
2010-07-02 07:33:39 -07:00
The Android Open Source Project
6069db77bb merge from open-source master
Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819
2010-07-02 07:31:36 -07:00
Jean-Baptiste Queru
45038e062d Add full-eng instead of generic-eng in the lunch menu
Change-Id: I3f779087021ef3674ee9ceb8cc3b15f83a98b8f4
2010-07-01 09:22:53 -07:00
Jeff Hamilton
77dfeaed2a Switch the required host Java environment to 1.6.
The path to the Java toolchain is now explicitly
specified so no manual configuration should be
required.

Change-Id: I84abc122c557372e77e4579e9a9efe56af2b412c

The java version changed, and we made envsetup automatically find the right JAVA_HOME.

This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee

Fix javadoc for Java 6.

If you don't set bootclasspath, there would be errors like:
javadoc: error - In doclet class DroidDoc, method start has thrown an exception java.lang.reflect.InvocationTargetException

Change-Id: I1b83360cb595d50577c6043d6e91b0f92e4c04d6

Avoid inheriting PRIVATE_BOOTCLASSPATH from moduels that depend on api-stubs-timestamp

The inherited value has caused build breakage on Mac build.

Change-Id: I8a1b1d6c6d411f6aaaee2d8dbd0297e3d60ab5c2

Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Don't check STAY_OFF_MY_LAWN in set_java_home.  That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
2010-06-30 13:36:27 -05:00
Ying Wang
6ae5c1b512 am b2fe30f0: am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88'

* commit 'b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 18:04:21 -07:00
Ying Wang
c955834ad0 am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"
Merge commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13' into gingerbread

* commit 'c048c9b598b36dc7506a954cc0d3d80f308b1b13':
  default empty tapas to TARGET_BUILD_APPS "all"
2010-06-24 17:59:32 -07:00
Ying Wang
c048c9b598 default empty tapas to TARGET_BUILD_APPS "all"
So that "tapas" without argument won't end in makefile-could-not-load error in unbundled branch.
Also, the magic "all" apps will build only apps, not other things.

Change-Id: Iac6dd928ee4e42996147acdab31930cd4ffa1768
2010-06-24 15:13:09 -07:00
Andy McFadden
d3e1d0e960 am 8969167d: am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Merge commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064'

* commit '8969167db684ebdbfe72dd57aea7f7bdd5de8064':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
2010-06-24 13:32:02 -07:00
Andy McFadden
bd960940e1 Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.
Don't check STAY_OFF_MY_LAWN in set_java_home.  That function already
refuses to update JAVA_HOME if it's set to something, which should
be sufficient for anybody who doesn't want the script to mess with it.

With this change, you can get the benefits of the 1.5/1.6 auto-selection
without having to suffer through window title changes.

Change-Id: I5cfc5d6fdf26a10b42b52925f877012c0506b9a5
2010-06-24 12:52:51 -07:00
Joe Onorato
74ba0c834f am 1884d99a: am aee4daac: The java version changed, and we made envsetup automatically find the right JAVA_HOME.
Merge commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c'

* commit '1884d99a7ab74dd53d9134d6200bb0aff3867f8c':
  The java version changed, and we made envsetup automatically find the right JAVA_HOME.
2010-06-23 16:04:38 -07:00
Joe Onorato
aee4daacc8 The java version changed, and we made envsetup automatically find the right JAVA_HOME.
This change forces everyone to re-source envsetup.sh

Change-Id: Ieb9512d5725cca26a83debf9b0480bc20e19d5ee
2010-06-23 14:03:13 -07:00
Jeff Hamilton
ba3897fdf1 am 66d41149: am 4a1c70e5: Switch the required host Java environment to 1.6.
Merge commit '66d41149d94fc7153467f9e1b0af55518ba86565'

* commit '66d41149d94fc7153467f9e1b0af55518ba86565':
  Switch the required host Java environment to 1.6.
2010-06-23 13:02:09 -07:00