Commit Graph

4235 Commits

Author SHA1 Message Date
Android (Google) Code Review fe626b775f Merge change 2631
* changes:
  Added support for TARGET_ARCH_VERSION=armv5te-vfp.
2009-05-28 15:41:55 -07:00
Andy McFadden 8f51a2ad06 Added support for TARGET_ARCH_VERSION=armv5te-vfp.
This is currently a copy & paste of the armv5te parameters.  I don't
know if there's a better way to encode this, or to what extent we will
need to specialize it vs. armv5te in a future build (e.g. to enable fp
instruction use in code gen).

Currently the only effect is to select the VFP-enabled mterp sources in
Dalvik.
2009-05-28 12:47:23 -07:00
Dima Zavin 0c72f970b0 am 46e9beca: core: Add support for static libraries to include other whole static libs.
Merge commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7'

* commit '46e9beca50057bd4ff375b35fd5958c05ce5bcb7':
  core: Add support for static libraries to include other whole static libs.
2009-05-28 12:31:35 -07:00
Dima Zavin 46e9beca50 core: Add support for static libraries to include other whole static libs.
Currently, if LOCAL_WHOLE_STATIC_LIBRARIES is specified, its values is
ignored. This patch addresses this limitation and works as follows:
For every whole lib specified, it extracts the archive into a sub-directory
under the target lib's intermediate, and then seeds the initial target
archive with all the members.

Signed-off-by: Dima Zavin <dima@android.com>
2009-05-27 20:14:55 -07:00
Doug Zongker f55791f720 am 8b70e8c6: use minigzip instead of system gzip in the build
Merge commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78'

* commit '8b70e8c6574e6e6e80aaa84fe1a9426995fa0a78':
  use minigzip instead of system gzip in the build
2009-05-27 15:06:53 -07:00
Doug Zongker 8b70e8c657 use minigzip instead of system gzip in the build
Use zlib's minigzip utility, built as part of our source tree, instead of
whatever installation of GNU gzip happens to be on the user's machine.
Using zlib's deflater, which is nicely available as a library (unlike
GNU gzip's deflater) will ultimately let us do binary patches to the
boot and recovery images.
2009-05-27 14:27:45 -07:00
The Android Open Source Project 9a27222882 merged 866a6d399e with conflicts in core/binary.mk 2009-05-25 08:48:37 -07:00
Android (Google) Code Review 866a6d399e Merge change 1642 into donut
* changes:
  Allow the build system to build Objective-C sources.
2009-05-25 02:53:19 -07:00
Android (Google) Code Review 4afb4f20fc am 3026e96d: Merge change 2245 into donut
Merge commit '3026e96dcea7893d762d3ad1532c3775dfe01b60'

* commit '3026e96dcea7893d762d3ad1532c3775dfe01b60':
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:55:41 -07:00
Android (Google) Code Review 3026e96dce Merge change 2245 into donut
* changes:
  Define TARGET_CPU_ABI for finding native code in .apks
2009-05-22 16:53:05 -07:00
Android (Google) Code Review e7a6072d2e am 6941562e: Merge change 2288 into donut
Merge commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81'

* commit '6941562ed3b2ca8fe315ce95bf15a0e57efb4a81':
  Adding in the path the new android.tts package.
2009-05-22 16:01:23 -07:00
Dianne Hackborn ecc70d705a Define TARGET_CPU_ABI for finding native code in .apks 2009-05-22 14:54:07 -07:00
Jack Palevich 3110264149 Add libacc to the prelink map.
Libacc is a tiny subset of C intended for use as a scripting language for
a 3D UI.
2009-05-22 12:13:32 -07:00
Robert Greenwalt fbd10d940d Add PRODUCT_DEFAULT_WIFI_CHANNELS build var.
Allows the build to specify the default number of allowed
WIFI channels.  Part of the fix for 1625953.
2009-05-21 18:46:57 -07:00
Jean-Michel Trivi e1da30426f Adding in the path the new android.tts package. 2009-05-21 18:44:30 -07:00
Mike Lockwood 3659b92a55 am 051672bc: Update the error message that occurs when current.xml needs regenerating.
Merge commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef'

* commit '051672bc6c41a5a24ed4057f9d78f5e9caaf7aef':
  Update the error message that occurs when current.xml needs regenerating.
2009-05-21 09:42:35 -07:00
Mike Lockwood 051672bc6c Update the error message that occurs when current.xml needs regenerating.
We are no longer using p4 for source control and there are no longer OWNERS files.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 09:27:39 -04:00
Android (Google) Code Review 5d72f8501d Merge change 2060
* changes:
  add an entry for libbinder in the prelink map
2009-05-20 12:40:21 -07:00
David 'Digit' Turner 5dbb529de9 Allow the build system to build Objective-C sources.
This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
2009-05-20 11:29:15 +02:00
Mathias Agopian 33e8306d2e add an entry for libbinder in the prelink map 2009-05-19 19:56:02 -07:00
Patrick Scott d033d57f40 Change PRIVATE to LOCAL for additional dependencies.
This change will be used by webcore_test in a separate change.
2009-05-19 18:13:58 -04:00
The Android Open Source Project 678ea42307 merge 9bd5404a9d w/conflict 2009-05-18 13:47:57 -07:00
Dianne Hackborn 9bd5404a9d Use new aapt feature to add default version info to .apks. 2009-05-18 12:41:45 -07:00
Ed Heyl 50ca1cf796 cherry-pick bd215ed974 2009-05-15 15:02:03 -07:00
Joe Onorato a3072e5ae5 am eefd0212: Print the platform version and version codename in the big build header.
Merge commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5'

* commit 'eefd0212f10ec83b21d1792130b4cad02d2ce4d5':
  Print the platform version and version codename in the big build header.
2009-05-15 08:11:38 -07:00
Joe Onorato eefd0212f1 Print the platform version and version codename in the big build header. 2009-05-15 09:10:51 -04:00
Doug Kwan bd215ed974 Rollback to gcc-4.2.1 2009-05-14 02:17:32 -07:00
Android (Google) Code Review a7e0325cd6 am 3de1fe6: Merge change 1529 into donut
Merge commit '3de1fe627073608270f844714f24ed83ed4266db'

* commit '3de1fe627073608270f844714f24ed83ed4266db':
  Fix makefile to be compatible with findbugs v 1.3.8
2009-05-13 14:15:30 -07:00
Dianne Hackborn ab1e594c5d Update build version to Eclair. 2009-05-13 13:21:02 -07:00
Andrew Stadler cef9ed98ac Fix makefile to be compatible with findbugs v 1.3.8
modified:   core/java.mk
2009-05-13 00:44:59 -07:00
Phil Dubach 502e9c8437 am 233728d: am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' scrip
Merge commit '233728de06f3ce711c0be94d5a3427bc007674a3'

* commit '233728de06f3ce711c0be94d5a3427bc007674a3':
  AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
2009-05-11 11:09:33 -07:00
Phil Dubach 233728de06 am 9e35a86: AI 148675: CTS: Copy only the \'startcts\' script into the cts
Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut

* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
  AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
2009-05-11 11:03:44 -07:00
Phil Dubach 9e35a86b83 AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
  case, so we want to exclude the 'cts' script from the distribution to avoid
  confusion. The 'cts' script is only used when running cts directly on a
  fully built source tree.

Automated import of CL 148675
2009-05-11 11:00:16 -07:00
Dianne Hackborn 0a6d796829 am 9537884: Add new property for dev codename, update version to Donut.
Merge commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5'

* commit '9537884b0dabe81bf612c79d12c7b4bf40de10a5':
  Add new property for dev codename, update version to Donut.
2009-05-08 13:52:08 -07:00
Dianne Hackborn 9537884b0d Add new property for dev codename, update version to Donut. 2009-05-08 13:03:08 -07:00
Dima Zavin 93a2620946 am 6ea3b88: core: Recovery image should have the custom kernel base as w
Merge commit '6ea3b8856d656752c0310ca237ed99e7451be83b'

* commit '6ea3b8856d656752c0310ca237ed99e7451be83b':
  core: Recovery image should have the custom kernel base as well.
2009-05-08 11:19:04 -07:00
Dima Zavin 6ea3b8856d core: Recovery image should have the custom kernel base as well.
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 21:10:41 -07:00
Dima Zavin c2e63593e5 am 1e0847c: core: Allow the board config to specify the kernel base addr
Merge commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec'

* commit '1e0847c2fcbe1b95464f32a719d2b9e620d1e6ec':
  core: Allow the board config to specify the kernel base address for mkbootimg
2009-05-07 19:59:48 -07:00
Dima Zavin 1e0847c2fc core: Allow the board config to specify the kernel base address for mkbootimg
Signed-off-by: Dima Zavin <dima@android.com>
2009-05-07 19:50:51 -07:00
Jorg Pleumann 9b659a23b0 am 1f61dc3: am 6178820: AI 148430: Adding a new CTS test runner that is
Merge commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0'

* commit '1f61dc3e19f1a18dabbc11ce6cf4a62851933ad0':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:41:12 -07:00
Jorg Pleumann 1f61dc3e19 am 6178820: AI 148430: Adding a new CTS test runner that is basically
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut

* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
  AI 148430: Adding a new CTS test runner that is basically
2009-05-07 01:36:23 -07:00
Jorg Pleumann 6178820340 AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
  and is built and installed as part of the CTS.
  This makes sure we always have the correct test
  runner on a device, so we should see the various
  improvements also on off-the-shelf Cupcake phones.
  BUG=1537738

Automated import of CL 148430
2009-05-07 01:33:14 -07:00
San Mehat e36c4a5b0b am 6ffb159: prelink: Add libsysutils to prelink map
Merge commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b'

* commit '6ffb159a8be65e2a63f17cc35f57e79e3e26809b':
  prelink: Add libsysutils to prelink map
2009-05-06 16:43:54 -07:00
San Mehat 6ffb159a8b prelink: Add libsysutils to prelink map
Signed-off-by: San Mehat <san@google.com>
2009-05-06 11:24:13 -07:00
Dave Bort 8acd848320 Merge commit '9528248' into master
Conflicts:
	core/combo/linux-arm.mk

Signed-off-by: Dave Bort <dbort@android.com>
2009-05-05 17:04:51 -07:00
Dave Bort 952824843b core: Don't debug native modules when TARGET_BUILD_TYPE==debug
Don't make the simulator default to debug mode.

Remove all global "debug" {C,CPP}FLAGS, which are no longer used.
2009-05-04 18:12:32 -07:00
Android (Google) Code Review e159bea824 Merge change 954
* changes:
  Extend build system to compile generated "C" files.
2009-05-04 15:41:01 -07:00
Jack Palevich e7b3e2c62e Extend build system to compile generated "C" files.
Until now only generated assembly or C++ files would be compiled. This patch extends the build
system to compile generated C files as well. The new rule is modeled on the existing rules for
compiling generated C++ files and the existing rule for compiling ordinary C files.
2009-05-04 15:03:23 -07:00
James Dong b41e725eae merged 2d2a9acac2 with conflicts.... 2009-05-04 11:23:14 -07:00
Android (Google) Code Review 6062815e2e Merge change 859 into donut
* changes:
  Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
2009-05-01 14:08:59 -07:00
James Dong 2d2a9acac2 Change 77 from git master branch:
change the prelink-linux-arm.map to include OC 2.0 new shared libs
- remove redundant share lib from the map
- remove 2way share lib from the map
2009-05-01 11:34:17 -07:00
Doug Kwan 6fa3704187 am 8c9bef6: switch compiler to gcc-4.3.1
Merge commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216'

* commit '8c9bef616666ee8c6d5cc9243f3d89c44d15d216':
  switch compiler to gcc-4.3.1
2009-04-30 18:11:11 -07:00
Joe Onorato 2f5b79ef04 am 7b2845a: Don\'t rebuild the NOTICE files when building with mm, mmm, e
Merge commit '7b2845ab1a47324a6fb25261048510e79656a732'

* commit '7b2845ab1a47324a6fb25261048510e79656a732':
  Don't rebuild the NOTICE files when building with mm, mmm, etc.
2009-04-30 16:52:20 -07:00
Doug Kwan 8c9bef6166 switch compiler to gcc-4.3.1
Switch default ARM compiler to gcc-4.3.1 for Neon support.
2009-04-30 15:04:28 -07:00
Joe Onorato 7b2845ab1a Don't rebuild the NOTICE files when building with mm, mmm, etc. 2009-04-30 13:52:50 -07:00
Phil Dubach 6cdbde9489 am e3a5777: am ccd2def: AI 147847: CTS: Fix core test dependencies in CT
Merge commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef'

* commit 'e3a5777a67b09bd54500c1b78c714972fa4793ef':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-29 11:02:43 -07:00
Bill Napier 4fa1f8e3bc am e468abd: am f22b9a0: AI 147775: Also add ApiDemos to make sure it get
Merge commit 'e468abda1c64923908ae711743d3e8c9f1b4a477'

* commit 'e468abda1c64923908ae711743d3e8c9f1b4a477':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-29 11:02:43 -07:00
Jorg Pleumann 56d4db7d7a am ecc08d0: am b3e0126: AI 147731: Forgot to submit the build changes fo
Merge commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15'

* commit 'ecc08d02b18f67a84df2f69e0d807761fc8dad15':
  AI 147731: Forgot to submit the build changes for the
2009-04-29 11:02:43 -07:00
Bill Napier 12ff9f3925 am 41ddfa9: am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100'

* commit '41ddfa903fe4e91e51d978d30bbbe6748ed1f100':
  AI 147479: Update list of CTS test packages.
2009-04-29 11:02:43 -07:00
Android (Google) Code Review bf1de8cbc9 am a47b47a: Merge change 530 into donut
Merge commit 'a47b47ad120b6410b2159722680907c53217c09c'

* commit 'a47b47ad120b6410b2159722680907c53217c09c':
  Remove obsolete activitycreator from windows SDK makefile.
2009-04-29 11:02:43 -07:00
Phil Dubach e3a5777a67 am ccd2def: AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut

* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
  AI 147847: CTS: Fix core test dependencies in CTS makefile
2009-04-28 21:52:48 -07:00
Bill Napier e468abda1c am f22b9a0: AI 147775: Also add ApiDemos to make sure it gets included i
Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut

* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
  AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
2009-04-28 21:52:48 -07:00
Jorg Pleumann ecc08d02b1 am b3e0126: AI 147731: Forgot to submit the build changes for the
Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut

* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
  AI 147731: Forgot to submit the build changes for the
2009-04-28 21:52:48 -07:00
Bill Napier 41ddfa903f am f23f5b4: AI 147479: Update list of CTS test packages.
Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut

* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
  AI 147479: Update list of CTS test packages.
2009-04-28 21:52:48 -07:00
Phil Dubach ccd2def288 AI 147847: CTS: Fix core test dependencies in CTS makefile
The core test descriptions did not list all dependencies. When building cts
  for the first time, the descriptions were generated before the cts
  repository was erased.
  BUG=1813815

Automated import of CL 147847
2009-04-27 12:07:38 -07:00
Bill Napier f22b9a0ad5 AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
well.
  BUG=1810821

Automated import of CL 147775
2009-04-24 18:26:58 -07:00
The Android Open Source Project 98dce16df0 Merge commit 'korg/donut' 2009-04-24 13:54:55 -07:00
Jorg Pleumann b3e0126a7a AI 147731: Forgot to submit the build changes for the
luni.AllTests removal.

Automated import of CL 147731
2009-04-24 13:40:00 -07:00
Raphael 9058e7293e Remove obsolete activitycreator from windows SDK makefile. 2009-04-23 18:58:26 -07:00
Bill Napier f23f5b4866 AI 147479: Update list of CTS test packages.
Automated import of CL 147479
2009-04-23 10:14:59 -07:00
Phil Dubach 0a4c2b02d0 AI 147397: CTS: Fix VM test description generator
Automated import of CL 147397
2009-04-22 11:56:14 -07:00
Urs Grob 8e5df6c024 Merge branch 'readonly-p4-master' 2009-04-18 22:45:40 -07:00
Urs Grob 4a27b76491 AI 146827: am: CL 146742 am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146827
2009-04-18 22:44:31 -07:00
Urs Grob b3c6b2df48 AI 146742: am: CL 146710 Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  Original author: ursg
  Merged from: //branches/cupcake/...

Automated import of CL 146742
2009-04-17 11:27:08 -07:00
Urs Grob 709b752e3b AI 146710: Splitting android.core.tests.apk into several smaller
apks. Each libcore module gets one apk and luni gets 4.
  BUG=1789657

Automated import of CL 146710
2009-04-17 02:07:14 -07:00
Raphael Moll 1032d83d51 Merge branch 'readonly-p4-master' 2009-04-16 10:55:25 -07:00
Raphael Moll a779a05e7e AI 146498: am: CL 145983 am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146498
2009-04-16 10:54:10 -07:00
The Android Open Source Project e53ceac5e2 Merge commit 'korg/cupcake' 2009-04-14 18:17:59 -07:00
Android (Google) Code Review 817a7ba786 Merge change 77
* changes:
  Squashed commit of the following:
2009-04-14 10:47:35 -07:00
Jianhong Jiang 7953e3000f Squashed commit of the following:
commit 191a8bc426782720b38d2af2151f654dc3241ffe
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:06:07 2009 -0700

    Change tabs into 4 spaces.

commit f47721ac22c353a93ddf56e3bd6ca21c01ad7091
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:14:05 2009 -0700

    OpenCore 2.02 prelink map change.
2009-04-13 18:58:11 -07:00
Raphael Moll a190c523af AI 145983: am: CL 145911 ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 145983
2009-04-13 18:21:16 -07:00
Joe Onorato 50d911553b Merge branch 'readonly-p4-master' 2009-04-13 16:33:27 -07:00
Joe Onorato eb19b3e0d1 AI 146003: am: CL 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/...
  Original author: android-build

Automated import of CL 146003
2009-04-13 16:32:16 -07:00
Andy McFadden 801cfe2a50 Merge branch 'readonly-p4-master' 2009-04-13 14:49:50 -07:00
Andy McFadden 743e250b30 AI 145942: Enable type-precise GC on sapphire builds.
Automated import of CL 145942
2009-04-13 14:48:35 -07:00
Raphael Moll a7bfb4f382 AI 145911: ADT #1778786: tool to generate stubbed jar file.
This is only a preliminary CL. More will follow but this is
  a good start, with the following caveats:
  What it does:
  - take an input jar, a list of includes, a list of excludes.
  - generate actual Java source for the filtered classes.
  What it doesn't do yet:
  - some more work on filtering inner elements (methods, etc.)
  - properly generate inner classes.
  - hide synthetic fields.
  - some classes body are missing
  - directly generate a stubbed bytecode/jar rather than source.
  I'll likely want to keep the source generator for debugging
  purposes or if we want to integrate with a build system instead.
  - classpath will be changed in the final CL to refer to the external
  ASM lib rather than the project. I need the source for debugging
  rigth now.
  - will review comments before submitting.
  BUG=1778786

Automated import of CL 145911
2009-04-13 12:53:33 -07:00
Joe Onorato 681925681a Fix the warning about NOTICE files overriding previous targets.
Use a different name for prebuilt libraries based on their LOCAL_MODULE --
they were all colliding using the same name, javalib.jar.  These names
are synthetic, since the libraries don't actually exist on the device
as such.
2009-04-13 12:51:43 -04:00
Joe Onorato 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
Mike Lockwood f22bf51669 Merge branch 'readonly-p4-master' 2009-04-10 06:36:47 -07:00
Mike Lockwood 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
Mike Lockwood 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
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