Dianne Hackborn
3f72af1370
Merge cb5b6d16
...
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
2011-06-10 07:29:48 -07:00
Dianne Hackborn
cb5b6d1690
am 0b22d93b
: Welcome, Android 3.2.
...
* commit '0b22d93be32eeff06e6626ad766b040057b931a5':
Welcome, Android 3.2.
2011-06-09 17:25:43 -07:00
Dianne Hackborn
0b22d93be3
Welcome, Android 3.2.
...
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
2011-06-09 16:40:02 -07:00
Mike Lockwood
0d23fec792
Add support for products overriding properties in /default.prop
...
We need this to allow products to specify the default USB configuration,
and allow the build system to add adb to this configuration
for eng and userdebug builds.
For example:
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
persist.sys.usb.config=mtp
Change-Id: I83d7d918e57a8117eb96919e17d8ad52afdc0388
Signed-off-by: Mike Lockwood <lockwood@android.com >
2011-06-09 14:54:40 -07:00
Dan Morrill
bb41d06d96
Update version to 2.3.5.
...
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
2011-06-09 13:20:55 -07:00
Joe Onorato
569e4fab49
Merge "post process the system properties"
2011-06-08 16:04:45 -07:00
Joe Onorato
9197a487b4
post process the system properties
...
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
2011-06-08 16:04:14 -07:00
Jean-Baptiste Queru
1cc1b10f0b
am f0d2a546
: Merge 78e7f1f0
...
* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
Increase the Java heap size for droiddoc
2011-06-07 18:20:30 -07:00
Jean-Baptiste Queru
70776231ee
am 45a3ad7d
: Merge c1efb060
...
* commit '45a3ad7d225495367a47440da118609b4940fe71':
Relax the constraint of 64bit build environment.
2011-06-07 18:20:25 -07:00
Jean-Baptiste Queru
f0d2a54669
Merge 78e7f1f0
...
Change-Id: I4d24d154fd3964a4433baf87e4061421fce28986
2011-06-07 13:11:14 -07:00
Jean-Baptiste Queru
45a3ad7d22
Merge c1efb060
...
Change-Id: I5688046fd44bc6420b541a0eb97a46d216655a3d
2011-06-07 13:10:06 -07:00
Doug Kwan
e3c3c6d4fe
Allow per module RTTI setting. This fixes a bug in previous check-ins.
...
Change-Id: I5fcac192a7945720fd7667f7497078d310370bc5
2011-06-07 10:55:48 -07:00
Martijn Coenen
3c22287c1b
Revert "x86: Enable -fstack-protector"
...
This reverts commit e397dcccbb
.
2011-06-07 08:57:34 -07:00
Ying Wang
65b710aefd
Merge "Use arg list file to pass arguments to jar."
2011-06-06 16:24:46 -07:00
David Turner
5d627263c8
am 0a2d335e
: am c1705c9a
: Merge "x86: Enable -fstack-protector"
...
* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
x86: Enable -fstack-protector
2011-06-06 14:39:32 -07:00
Ying Wang
194a8ec8ae
Use arg list file to pass arguments to jar.
...
To fix error "/bin/bash: Argument list too long"
Change-Id: Ie336b18f9a7eba38d94a6e32c07a88589ce9f1fd
2011-06-06 14:34:52 -07:00
Doug Kwan
1081a05359
Merge "Revert "Clear LOCAL_RTTI_FLAG.""
2011-06-06 13:20:49 -07:00
David Turner
486ce3495c
am e4778e6a
: am 4272b32a
: Merge "Clean up of X86 build flags"
...
* commit 'e4778e6ab82a40475081482f26759985deeb7f21':
Clean up of X86 build flags
2011-06-06 12:56:15 -07:00
David Turner
0a2d335e99
am c1705c9a
: Merge "x86: Enable -fstack-protector"
...
* commit 'c1705c9ad8da4d6c2d267e27afd6e16aa7b431b6':
x86: Enable -fstack-protector
2011-06-06 12:27:26 -07:00
Doug Kwan
6f937973ff
Revert "Clear LOCAL_RTTI_FLAG."
...
This reverts commit f524df7ce1
.
2011-06-06 12:11:19 -07:00
David Turner
e4778e6ab8
am 4272b32a
: Merge "Clean up of X86 build flags"
...
* commit '4272b32a86bd22ce560e41816cece950a7af4e51':
Clean up of X86 build flags
2011-06-06 11:33:04 -07:00
Jean-Baptiste Queru
78e7f1f014
am 536938e0
: am 978f86ea
: Merge "Increase the Java heap size for droiddoc"
...
* commit '536938e01195a2ee279a6652e0b88c50d5f4c2a8':
Increase the Java heap size for droiddoc
2011-06-06 08:23:09 -07:00
Jean-Baptiste Queru
536938e011
am 978f86ea
: Merge "Increase the Java heap size for droiddoc"
...
* commit '978f86ea5439ce192e9c343fc2565f1ec4e2e6d2':
Increase the Java heap size for droiddoc
2011-06-06 08:19:48 -07:00
Jean-Baptiste Queru
978f86ea54
Merge "Increase the Java heap size for droiddoc"
2011-06-06 08:12:31 -07:00
Doug Kwan
f524df7ce1
Clear LOCAL_RTTI_FLAG.
...
Change-Id: I0f1388e76af1ce0592cd3271a689fbb6c0ea3eba
2011-06-03 18:26:48 -07:00
Ying Wang
4387dc3ee1
am 823f6389
: am 3487736b
: am 7d83ef8f
: Support custom RenderScript compiler
...
* commit '823f63894fb4ad5c1280a5ee7eb004792223a488':
Support custom RenderScript compiler
2011-06-02 16:49:33 -07:00
Ying Wang
32945410b9
am bb567df0
: am 4cd9e2d9
: am 06e2f72b
: Support to run dex-preopt on prebuilt apks.
...
* commit 'bb567df00abfe33d800339eba089b8cfd91a7785':
Support to run dex-preopt on prebuilt apks.
2011-06-02 14:06:24 -07:00
Jean-Baptiste Queru
c33e07396b
Merge from gingerbread
...
Change-Id: If6c009d62eb4b2ed931d3e5082d08ad996aca689
2011-06-01 14:09:28 -07:00
Doug Kwan
e804fc92ec
Merge "Allow enabling RTTI in a module."
2011-06-01 11:23:20 -07:00
Jean-Baptiste Queru
c1efb06045
am 3c60c67a
: Merge from open-source gingerbread
...
* commit '3c60c67ad2a157f5bfb731accfc74f5b42c69851':
Relax the constraint of 64bit build environment.
2011-06-01 08:07:56 -07:00
Jean-Baptiste Queru
3c60c67ad2
Merge from open-source gingerbread
...
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
2011-06-01 07:42:19 -07:00
Joe Onorato
149dd914b8
Switch the java encoding from ascii to utf8.
...
Change-Id: Iee0972df68b44fc8c653812cf165b57350a7ec5d
2011-05-31 18:21:07 -07:00
Dan Bornstein
f7ad63ae65
Clean up how dex preoptimization gets configured.
...
Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5
2011-05-31 10:36:55 -07:00
Ying Wang
823f63894f
am 3487736b
: am 7d83ef8f
: Support custom RenderScript compiler
...
* commit '3487736bac5625bef8ff9bc4ef311b29348055d9':
Support custom RenderScript compiler
2011-05-27 15:38:10 -07:00
Ying Wang
3487736bac
am 7d83ef8f
: Support custom RenderScript compiler
...
* commit '7d83ef8ff7679239063bb8484f0c1fdcf31abf8b':
Support custom RenderScript compiler
2011-05-27 15:35:48 -07:00
Ying Wang
7d83ef8ff7
Support custom RenderScript compiler
...
Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
2011-05-27 13:47:17 -07:00
Brian Carlstrom
af85000e7a
Breakup android.core.tests.libcore based on top level package name
...
git cherry-pick --no-commit ec122eb2c11dfb8553d3707208a1ecbe7366f61b
Change-Id: I685ece362674f83f179ace34367fce88a7f541fb
2011-05-27 00:04:57 -07:00
Ying Wang
1482d2db83
am e2419c89
: Support to run dex-preopt on prebuilt apks.
...
* commit 'e2419c89cef4eeae1b6cd113ef1c92d397834841':
Support to run dex-preopt on prebuilt apks.
2011-05-26 17:10:37 -07:00
Ying Wang
bb567df00a
am 4cd9e2d9
: am 06e2f72b
: Support to run dex-preopt on prebuilt apks.
...
* commit '4cd9e2d99090502ced431b7abbff94bcc2176745':
Support to run dex-preopt on prebuilt apks.
2011-05-26 16:31:42 -07:00
Ying Wang
4cd9e2d990
am 06e2f72b
: Support to run dex-preopt on prebuilt apks.
...
* commit '06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
Support to run dex-preopt on prebuilt apks.
2011-05-26 16:14:32 -07:00
Ying Wang
06e2f72bc9
Support to run dex-preopt on prebuilt apks.
...
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
2011-05-26 16:01:57 -07:00
Ying Wang
e2419c89ce
Support to run dex-preopt on prebuilt apks.
...
Change-Id: I11450310144cb8d7f127c427ada4a0589e030843
2011-05-26 15:59:56 -07:00
Ying Wang
d90ff5e4c3
Fix possible unnecessary rebuild
...
This fix the unnecessary rebuild in the following scenario:
A package rename its manifest package name and the old R.java was still
in its intermediate dir. The rule to generate R_file_stamp may always
copy the old R.java with timestamp reserved and the R_file_stamp never
gets updated.
Change-Id: I659cbb00f0e7734d7d71e1ca66065f587c8dee2c
2011-05-26 13:43:57 -07:00
Bruce Beare
e397dcccbb
x86: Enable -fstack-protector
...
Change-Id: I1fe10159b7a29452ecfc6ba328164948cf9950d6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2011-05-26 08:53:04 -07:00
David Turner
4272b32a86
Merge "Clean up of X86 build flags"
2011-05-24 22:58:20 -07:00
Ying Wang
bd08b7e415
Merge "Fix use of intermediates in droiddoc"
2011-05-24 16:27:29 -07:00
Ying Wang
053dccb159
Relax the constraint of 64bit build environment.
...
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
2011-05-24 15:46:15 -07:00
Jean-Baptiste Queru
cdef404572
Merge 5d66a07d
- do not merge
...
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Mark D Horn
5812d7b469
Clean up of X86 build flags
...
Review and clean-up of both compiler and linker flags
to ensure proper usage and consistency for images, toolchain,
SDK, and NDK.
Change-Id: Ife75c32cd49b32345712dee28fa5f2283069a90e
Signed-off-by: Mark D Horn <mark.d.horn@intel.com >
Author: Bruce Beare <bruce.j.beare@intel.com >
2011-05-18 14:10:58 -07:00
Jean-Baptiste Queru
772a0f6794
Switch to mksh as the default shell.
...
Switch the emulator builds to ash to make sure it still
works, in case we find that we need to go back to using ash.
Change-Id: Id5641940b63cc4225011be1c375f4c86ec4d21cc
2011-05-18 13:49:08 -07:00