Commit Graph

21519 Commits

Author SHA1 Message Date
The Android Open Source Project
3c9e08a9ff Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:23 -07:00
d9b64e1350 AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2009-03-31 17:20:53 -07:00
a401b054a4 AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
2009-03-31 17:19:14 -07:00
e340277c06 AI 143876: Include hprof-conv in SDK (bug #1640225)
BUG=1640225

Automated import of CL 143876
2009-03-31 17:16:45 -07:00
Ravi K Yenduri
452c5b35e2 Enable OpenCORE on master - part 3 2009-03-31 12:11:26 -07:00
Jean-Baptiste Queru
e3a08f2a1f Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
2009-03-31 09:34:55 -07:00
Jean-Baptiste Queru
3eb9e18159 Fix build: disable OpenCORE by default.
Fixes http://b.android.com/2308

This is not meant to be a permanent fix, but since everyone except
a handful of people need this, it's easier to set it for everyone
and have that handful of people unset is locally than to force
everyone to make a local tweak.
2009-03-30 16:05:57 -07:00
The Android Open Source Project
8ac438f110 Merge branch 'open_source' into google_internal
Conflicts:
	core/build_id.mk
2009-03-29 08:55:26 -07:00
The Android Open Source Project
1379256b55 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
35354dc754 Automated import from //branches/donutburger/...@142719,142719 2009-03-25 17:01:21 -07:00
7bbec3ab97 Automated import from //branches/master/...@142758,142758 2009-03-25 16:12:29 -07:00
436aefc2d0 Automated import from //branches/cupcake/...@142639,142639 2009-03-25 15:21:11 -07:00
Fredrik Markström
b7990f700b Modify linux-arm.mk to support the armv4t architecture instead of armv4.
armv4 was only implemented on StrongArm and Arm8 (See http://en.wikipedia.org/wiki/ARM_architecture)
and will be more difficult to support since it does not support the bx instruction.
armv4t on the other hand is used in a wide range of cpu:s.
armv4 is also not supported by bionic or dalvik, but armv4t is.

Thumb-mode is not yet enabled since there are some unresolved abi-issues.
2009-03-25 13:20:37 +01:00
4bb2b38d7d Automated import from //branches/master/...@142411,142411 2009-03-24 22:47:20 -07:00
7b64124f0b Automated import from //branches/donutburger/...@142410,142410 2009-03-24 22:40:59 -07:00
867c51aa33 Automated import from //branches/master/...@141763,141763 2009-03-24 20:52:27 -07:00
d14f6d92d4 Automated import from //branches/donutburger/...@141759,141759 2009-03-24 20:50:42 -07:00
09591102d0 Automated import from //branches/cupcake/...@142409,142409 2009-03-24 19:39:09 -07:00
bd46b21c31 Automated import from //branches/donutburger/...@140982,140982 2009-03-24 19:07:34 -07:00
1e7b6d490b Automated import from //branches/master/...@140984,140984 2009-03-24 19:07:34 -07:00
0c56ccb7cc Automated import from //branches/cupcake/...@141670,141670 2009-03-24 18:07:52 -07:00
14c8a23990 Automated import from //branches/cupcake/...@141669,141669 2009-03-24 18:07:02 -07:00
The Android Open Source Project
b87fef6336 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project
1fc1b4b05c auto import //branches/master/...@140412 2009-03-18 22:20:24 -07:00
The Android Open Source Project
a7e72e17df auto import //branches/donutburger/...@140359 2009-03-18 20:53:43 -07:00
The Android Open Source Project
f122bec404 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:42 -07:00
Jean-Baptiste Queru
ccf4b83b02 Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Conflicts:
	core/prelink-linux-arm.map
2009-03-18 16:58:18 -07:00
The Android Open Source Project
6bce205856 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -07:00
The Android Open Source Project
fdd3a1020c auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
Ravi K Yenduri
93f49670cf Allow prebuilt libraries and the associated makefile to be in
different directories.
2009-03-10 15:05:09 -05:00
The Android Open Source Project
2f31293ba7 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
6a5f7f068b auto import from //depot/cupcake/@136594 2009-03-05 14:34:30 -08:00
The Android Open Source Project
88b607994a auto import from //depot/cupcake/@135843 2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6 auto import from //depot/cupcake/@135843 2009-03-03 18:28:14 -08:00
The Android Open Source Project
094268cf8c auto import from //depot/cupcake/@132589 2009-03-03 14:03:52 -08:00
The Android Open Source Project
a9b2249753 auto import from //depot/cupcake/@137055 2009-03-02 22:54:15 -08:00
Garret Pick
8c3ad517eb OpenCORE 2.1 update 2009-02-24 10:03:51 -08:00
The Android Open Source Project
4d23ccc023 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
41977d7cd2 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
dca10d536d auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
The Android Open Source Project
475fa12ade auto import from //branches/cupcake/...@130745 2009-02-10 15:43:57 -08:00
Angus Lees
4cf7606d7e Remove bashism from find-jdk-tools-jar.sh 2009-01-30 10:17:52 +00:00
Brock Atchison
aeb2fa61cf Changes required to accommodate OpenCORE 2.0 2009-01-26 16:52:00 -08:00
The Android Open Source Project
b33e7b0cb0 Merge branch 'cupcake' 2009-01-22 00:15:56 -08:00
The Android Open Source Project
35cfb08c58 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:40 -08:00
Jean-Baptiste Queru
d58b8f6065 Update the current.xml error message.
The previous message contained some perforce-isms that aren't applicable
in the git world.
2009-01-20 14:54:54 -08:00
The Android Open Source Project
e914857b89 Merge branch 'cupcake' 2009-01-20 14:05:22 -08:00
The Android Open Source Project
ed18741e07 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
android-build SharedAccount
0c2b8bfb87 Merge branch 'cupcake' 2009-01-15 16:15:46 -08:00
The Android Open Source Project
66339ad5ce auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00