Commit Graph

2598 Commits

Author SHA1 Message Date
03fbe40d53 AI 145850: am: CL 145512 SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145850
2009-04-13 08:31:16 -07:00
f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -07:00
ed8b386128 AI 145705: am: CL 145704 Manually integrate change 145576 to donutburger to fix "lunch"
Original author: lockwood

Automated import of CL 145705
2009-04-10 06:35:35 -07:00
8539929a12 AI 145704: Manually integrate change 145576 to donutburger to fix "lunch"
Automated import of CL 145704
2009-04-10 06:34:59 -07:00
44a48f7d77 Merge branch 'readonly-p4-master' 2009-04-09 20:45:06 -07:00
4c096ad580 AI 145659: am: CL 145621 am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145659
2009-04-09 20:43:57 -07:00
fbac5ec731 Merge branch 'readonly-p4-master' 2009-04-09 20:37:13 -07:00
214a42bbb6 AI 145655: am: CL 145618 am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145655
2009-04-09 20:36:06 -07:00
92f8a3a7c3 AI 145621: am: CL 145373 remove a debugging printf that sometimes breaks the build
because the commandline is too long
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145621
2009-04-09 19:39:15 -07:00
64d85d0d82 AI 145618: am: CL 145333 Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.
  Original author: joeo
  Merged from: //branches/cupcake/...

Automated import of CL 145618
2009-04-09 19:31:12 -07:00
ef09681e42 AI 145576: Probe for the proper sed(1) extended regex switch
Automated import of CL 145576
2009-04-09 17:20:55 -07:00
15ca0bd5d0 AI 145512: SDK add-on updates
- rename the directory and zip file
  - make it build to the dist directory

Automated import of CL 145512
2009-04-09 14:20:30 -07:00
a9cc3ca8be AI 145373: remove a debugging printf that sometimes breaks the build
because the commandline is too long

Automated import of CL 145373
2009-04-09 12:05:55 -07:00
8bbfe659d7 AI 145333: Cloned from CL 144759 by 'g4 patch'.
Original change by joeo@abreu on 2009/04/06 19:54:13.
  Implement SDK add-ons in the build system.
  - Add an option to use the standard javadoc doclet instead
  of droiddoc, since droiddocs non-sdk templates aren't
  ready for prime time.
  - Add the notion of a stubs for a library.  It's only
  implemented for java libraries, but when we do native
  libraries in the NDK or sdk-addons, it will work there too.

Automated import of CL 145333
2009-04-09 10:17:32 -07:00
Jean-Baptiste Queru
e34380bea4 revert prelink map to match OpenCORE 1.0 2009-04-08 14:38:13 -07:00
Ravi K Yenduri
be8708351a Enable OpenCORE on master - part 3 2009-04-08 14:37:50 -07:00
8f9b9d52fd Merge branch 'readonly-p4-master' 2009-04-06 20:33:25 -07:00
f3e79f9041 AI 144767: am: CL 144765 am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144767
2009-04-06 20:32:24 -07:00
6a769427c8 AI 144765: am: CL 144764 Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 144765
2009-04-06 20:30:02 -07:00
f39ac4218b AI 144764: Fix the SDK build to properly package what needs to go in the system image (bug #1761105)
BUG=1761105

Automated import of CL 144764
2009-04-06 20:29:27 -07:00
Android Code Review
57d1b24414 Merge change 9452
* changes:
  Ensure that /system/etc/vold.conf is created in the "generic" product. This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
2009-04-06 12:08:55 -07:00
Sean McNeil
d47804e929 Provide LOCAL_DIR as some product variables might need a reference directory (i.e. PRODUCT_COPY_FILES).
Change from LOCAL_DIR to LOCAL_PATH
2009-04-04 18:46:13 +07:00
d9290f2a0f Merge branch 'readonly-p4-master' 2009-04-02 10:21:16 -07:00
32a27c8577 AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
2009-04-02 10:20:05 -07:00
06f93798f4 Merge branch 'readonly-p4-master' 2009-04-02 10:13:30 -07:00
7cb8e199b4 AI 144132: am: CL 144130 Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144132
2009-04-02 10:12:24 -07:00
934de9b758 AI 144143: Define OTA_PUBLIC_KEYS to be the test keys in the otapackage
target as well.

Automated import of CL 144143
2009-04-02 01:15:57 -07:00
17c83cf22c AI 144130: Don't build OTA package keys into the recovery binary; read
them from an external file in the recovery image.  Use the
  test-keys for all builds.

Automated import of CL 144130
2009-04-01 15:48:46 -07:00
David 'Digit' Turner
ff2c9deb79 Ensure that /system/etc/vold.conf is created in the "generic" product.
This is necessary to let the emulator mount SD Card images properly through the "vold" mounting daemon
2009-04-01 15:26:07 +02:00
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