Commit graph

187 commits

Author SHA1 Message Date
Sriram Raman
d9f7a05830 am f1a55f8b: Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
Merge commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf'

* commit 'f1a55f8bfbaa1a68d96e229b4e73c9e9209d82cf':
  Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
2009-06-09 16:09:43 -07:00
Sriram Raman
f1a55f8bfb Fix the usual build hanging issue by using -o (overwrite without prompting) option with unzip
This should fix the common problem when googlelogin-client and google-framework are both included
2009-06-09 15:08:29 -07:00
Tammo Spalink
e7382b8652 am 0bb9ce9e: fix build -- aidl was not finding vpn imports
Merge commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4'

* commit '0bb9ce9ec3d744444019f8ea191bb63f0ba3b2d4':
  fix build -- aidl was not finding vpn imports
2009-06-08 23:09:54 -07:00
Tammo Spalink
0bb9ce9ec3 fix build -- aidl was not finding vpn imports 2009-06-09 13:45:20 +08:00
Android (Google) Code Review
81d04d57f2 am a0bad432: Merge change 3237 into donut
Merge commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6'

* commit 'a0bad432f38f3b5105d79a1dadc1ccda061934b6':
  Add archquery to the windows make
2009-06-05 00:29:55 -07:00
Raphael
d8a6ac1000 Add archquery to the windows make 2009-06-04 17:02:21 -07:00
David 'Digit' Turner
3585e95918 Fix armv5te-vfp build. Aargh 2009-05-29 22:54:40 +02:00
David 'Digit' Turner
d53c81d7c5 Rename TARGET_ARCH_VERSION to TARGET_ARCH_VARIANT +
Move arch-specific definitions into core/combo/arch/arm/<variant>.mk
2009-05-29 21:36:49 +02:00
Android (Google) Code Review
ca85166e8a Merge change 2703
* changes:
  add libGLES_android.so to the prelink map, this will replace libagl.so eventually
2009-05-28 20:40:44 -07:00
Mathias Agopian
0f36b46bc0 add libGLES_android.so to the prelink map, this will replace libagl.so eventually 2009-05-28 20:40:11 -07:00
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