Commit Graph

109 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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