Commit Graph

19344 Commits

Author SHA1 Message Date
Joe Onorato 44a48f7d77 Merge branch 'readonly-p4-master' 2009-04-09 20:45:06 -07:00
Joe Onorato 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
Joe Onorato fbac5ec731 Merge branch 'readonly-p4-master' 2009-04-09 20:37:13 -07:00
Joe Onorato 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
Joe Onorato 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
Joe Onorato 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
Dave Bort 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
Joe Onorato 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
Joe Onorato 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
Joe Onorato 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
Xavier Ducrohet 8f9b9d52fd Merge branch 'readonly-p4-master' 2009-04-06 20:33:25 -07:00
Xavier Ducrohet 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
Xavier Ducrohet 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
Xavier Ducrohet 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
Doug Zongker d9290f2a0f Merge branch 'readonly-p4-master' 2009-04-02 10:21:16 -07:00
Doug Zongker 32a27c8577 AI 144157: Manually integrate 144143 from donut to fix build.
Automated import of CL 144157
2009-04-02 10:20:05 -07:00
Doug Zongker 06f93798f4 Merge branch 'readonly-p4-master' 2009-04-02 10:13:30 -07:00
Doug Zongker 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
Doug Zongker 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
Doug Zongker 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
Raphael Moll 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
Raphael Moll 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
Raphael Moll 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
Eric Fischer 35354dc754 Automated import from //branches/donutburger/...@142719,142719 2009-03-25 17:01:21 -07:00
Eric Fischer 7bbec3ab97 Automated import from //branches/master/...@142758,142758 2009-03-25 16:12:29 -07:00
Eric Fischer 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
Sriram Raman 4bb2b38d7d Automated import from //branches/master/...@142411,142411 2009-03-24 22:47:20 -07:00
Sriram Raman 7b64124f0b Automated import from //branches/donutburger/...@142410,142410 2009-03-24 22:40:59 -07:00
Dave Bort 867c51aa33 Automated import from //branches/master/...@141763,141763 2009-03-24 20:52:27 -07:00
Dave Bort d14f6d92d4 Automated import from //branches/donutburger/...@141759,141759 2009-03-24 20:50:42 -07:00
Sriram Raman 09591102d0 Automated import from //branches/cupcake/...@142409,142409 2009-03-24 19:39:09 -07:00
Joe Onorato bd46b21c31 Automated import from //branches/donutburger/...@140982,140982 2009-03-24 19:07:34 -07:00
Joe Onorato 1e7b6d490b Automated import from //branches/master/...@140984,140984 2009-03-24 19:07:34 -07:00
Sriram Raman 0c56ccb7cc Automated import from //branches/cupcake/...@141670,141670 2009-03-24 18:07:52 -07:00
Sriram Raman 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
Sriram Raman 45bf3d2424 Fix make dist to create img and other zip files on master. 2009-01-13 17:09:35 -08:00
The Android Open Source Project 70b813ec57 auto import from //branches/cupcake/...@125939 2009-01-09 18:27:30 -08:00
The Android Open Source Project 4f85cc54b3 auto import from //branches/cupcake/...@125939 2009-01-09 17:50:54 -08:00
Jean-Baptiste Queru 179d2bf01a Merge commit 'remotes/korg/cupcake'
Conflicts:
	core/api/1.xml
	core/api/current.xml
	core/main.mk
2008-12-19 07:58:19 -08:00
The Android Open Source Project dcc08f073b Code drop from //branches/cupcake/...@124589 2008-12-17 18:03:49 -08:00
Jean-Baptiste Queru d3aa4000e4 Reflect the change in the original media.AudioSystem API so that API-validation continues to work 2008-11-24 10:00:55 -08:00
Jean-Baptiste Queru d1fa901ebb Reflect the change in the original media.AudioSystem API so that API-validation continues to work 2008-11-21 14:18:23 -08:00
Dave Bort 6942cfff6c Fix "make dist"
Remove a dependency on the OTA package for now.
2008-11-18 17:11:45 -08:00
Dave Bort 7572f52897 Install apns-conf_sdk.xml if no other apns-conf.xml is specified
This should make data work in generic emulator builds.
2008-11-03 15:54:13 -08:00
Ben Leslie e03f0237f7 This is the first set of build system changes to support
architecture versions other than ARMv5TE.

The general approach is to provide TARGET_ARCH_VERSION, to complement
TARGET_ARCH. This defaults to the current armv5te. The variable
values should match the architectures as defined by gcc.

There is a block of defines for each supported architecture version
(currently ARMv5TE and ARMv4). Each block defines a set of features
using ARCH_ARM_HAVE_<x> variables. It also specifies a set of c
preprocessor defines to pass to the compiler. Finally it defines a
default CPU. (As for architecture versions, the default CPU should
match a CPU that gcc knows about.)

Support is added for architectures that do not support THUMB. Specifically
we change the 'thumb compile' target to simply compile as ARM code
instead, and we change the interworking flag passed to the compiler.

Finally, we ensure that the system/core/include/arch/linux-arm directory
is added to the default include path, which allows the use of asm/macros.h
header file described in review #1626. The way in which this done is
considerably unclean/hacky, if someone can suggest a better way please
let me know.
2008-11-01 10:15:37 +11:00
Bill Napier d858fe8e02 Changed dexpreopt/Config.mk to use new (correct) path. 2008-10-28 11:40:24 -07:00
Jeff Hamilton 8c1fc1a3b8 Fix the build by hand apling JBQs current.xml change because my attempt to merge failed. 2008-10-25 11:08:30 -07:00
Brian Swetland 6dbec6f844 revive the TINY_ANDROID build option
- update core/main.mk to include the right top-level directories
- disable tasks/apicheck.mk in TINY_ANDROID builds to prevent failure
2008-10-24 22:49:11 -07:00
Jeff Hamilton 3c9065eeaa Fix the build with a proper current.xml API file. 2008-10-23 20:50:16 -07:00
Joe Onorato 2303bf0499 add build system design doc 2008-10-23 19:52:23 -07:00
Joe Onorato a2121e9247 ftb (fix the build) 2008-10-23 18:13:27 -07:00
Cliff Spradlin 128ce209ba Added broadcasts for external power events. 2008-10-22 20:32:19 -07:00
Rod Whitby 3caa7cfa04 Detect a missing javac and provide a slightly more helpful error message.
Note the hyphens in the error message are required because the output of
this scripts is used directly in a Makefile target.

Signed-off-by: Rod Whitby <rod@whitby.id.au>
2008-10-22 11:49:14 +10:30
The Android Open Source Project b6c1cf6de7 Initial Contribution 2008-10-21 07:00:00 -07:00