Commit Graph

1955 Commits

Author SHA1 Message Date
Tor Norbye
59075b8fbc Make asm-3.1 an optional module, remove from grandfathered list
Change-Id: I880cb298fad81d439e557ff5949cc9105bec217b
2011-12-05 14:31:50 -08:00
Ying Wang
99bcbeb355 Print more info of the image size stats.
Bug: 5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.

Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
2011-12-02 10:34:45 -08:00
Marius Renn
33abebcc3f am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
  Google Add-On API Documentation Fixes (5429077)
2011-11-30 10:51:17 -08:00
Marius Renn
f945235a8a am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit '72db32c744744ae1ace26830ecce968b6a95e173':
  Google Add-On API Documentation Fixes (5429077)
2011-11-30 09:53:05 -08:00
Ying Wang
b50bd7f009 Move the prebuilt NDKs to their own git project prebuilts/ndk/.
Change-Id: If85986da436d412cff139af1fd8426e420bec121
2011-11-29 11:20:16 -08:00
Ying Wang
9978faf8f5 Move prebuilt SDKs to their own git project.
Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
2011-11-29 10:24:27 -08:00
Marius Renn
b1df701ed8 Google Add-On API Documentation Fixes (5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
Jeff Hamilton
86624bf608 Merge "Bypass alias for grep in the tapas command." 2011-11-18 15:30:34 -08:00
Jeff Hamilton
293f9392ba Bypass alias for grep in the tapas command.
Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
2011-11-18 17:24:13 -06:00
Svetoslav Ganov
cbd4821b0a am ecca008c: am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit 'ecca008c17c0f74a749289e23f8606f1b92930f6':
  Add the support libraries to the platform documentation (build).
2011-11-18 15:22:34 -08:00
Jing Yu
877bddc604 Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields." 2011-11-18 14:34:53 -08:00
Jing Yu
7bf82e0171 Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields.
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
2011-11-18 14:22:55 -08:00
Svetoslav Ganov
ecca008c17 am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '700b18cc72e75737fa5cf79896c98f12003b7735':
  Add the support libraries to the platform documentation (build).
2011-11-18 10:14:02 -08:00
Svetoslav Ganov
155d855cee Add the support libraries to the platform documentation (build).
Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba
2011-11-17 15:13:56 -08:00
Raphael
1985846eb0 Merge "SDK: pass $HOST_OUT variable to atree." 2011-11-16 14:19:11 -08:00
Raphael
2a533178c1 SDK: pass $HOST_OUT variable to atree.
Required by Change Id623bbef45 in development.git

Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
2011-11-15 16:32:42 -08:00
Dianne Hackborn
227b9f8b9b Merge "Dev branch for ICS MR2." 2011-11-14 13:14:25 -08:00
The Android Open Source Project
e446160ae1 am 4115aeae: am 324c814c: Merge from AOSP
* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:07:31 -08:00
The Android Open Source Project
4115aeaef3 am 324c814c: Merge from AOSP
* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:06:02 -08:00
The Android Open Source Project
324c814c6f Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
Ying Wang
7deff5fc54 am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:38:14 -08:00
Jean-Baptiste Queru
f9b556cd51 Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Ying Wang
bb5ada524c am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:36:39 -08:00
Nick Kralevich
32a3e84f4d Merge "make gdbclient work on x86" 2011-11-11 11:43:11 -08:00
Ying Wang
a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Nick Kralevich
0ab21d3ed3 make gdbclient work on x86
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
2011-11-11 09:02:01 -08:00
Dianne Hackborn
6e4e1bbbc1 Dev branch for ICS MR2.
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
2011-11-10 15:19:51 -08:00
Ying Wang
9f8e8db188 Build cache.img on demand
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
2011-11-10 14:30:34 -08:00
Jim Huang
ba2c734f71 am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-11-10 21:35:56 +00:00
Jim Huang
e39ee4d5e0 am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-11-10 21:34:23 +00:00
Jim Huang
cb48497ff2 HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-11-10 13:28:13 -08:00
Conley Owens
e04c2c21ee am e915ab45: Place linker arguments after objects for gcc
* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
  Place linker arguments after objects for gcc
2011-11-10 19:01:36 +00:00
Conley Owens
e915ab45a1 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 10:55:13 -08:00
Conley Owens
d9e7d25741 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 09:57:40 -08:00
Nick Kralevich
d9d2e7a42c x86: enable PIE for dynamically linked executables
Compile all x86 programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.

Note 1: PIE *static* executables are not supported at this time and
require additional linker changes.

Note 2: This change compliments 026a85b129,
which was the exact same change, except for ARM.

Testing: Rebuilt the tree completely from scratch, and verified
that the system boots and basic functionality works in the emulator.

Change-Id: I990064c37da3d857e663b27f31fee05f689a2824
2011-11-04 13:15:24 -07:00
Brian Muramatsu
ff728d2c2d am 976fbcbd: am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '976fbcbd095ced5b07e7b0ed777f013c7b8ca717':
  Stop Packaging Old CTS Test Runner Files
2011-11-03 19:59:30 +00:00
Brian Muramatsu
e43794ace2 am 277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
  Stop Packaging Old CTS Test Runner Files
2011-11-03 19:56:00 +00:00
Brian Muramatsu
277be2fe0c Stop Packaging Old CTS Test Runner Files
Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
2011-11-03 11:42:39 -07:00
Nick Kralevich
003dc3cf43 Merge "stop using a custom linker script for static executables." 2011-11-02 16:44:10 -07:00
Ying Wang
d4495e9933 Allow to set ANDROID_BUILDSPEC as path of buildspec.mk
So that clients can set a custom buildspec.mk without adding
buildspec.mk at the top dir.

Change-Id: Ic15efa6cfbf00f04db35447e70bb5bdd63a5058c
2011-11-02 14:12:51 -07:00
Dianne Hackborn
caf58b1f5c am 0c8f79dd: am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1
* commit '0c8f79dd01366a45b255584ef279e498741728e4':
  MR1 is version 4.1, API 15.
2011-11-02 18:42:39 +00:00
Dianne Hackborn
b32faad390 MR1 is version 4.1, API 15.
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
2011-11-02 11:37:25 -07:00
Ying Wang
c0debb9b5e Revert "Build cache.img."
This reverts commit 531bdb546a.
2011-11-02 11:19:28 -07:00
Nick Kralevich
4185447f2f stop using a custom linker script for static executables.
This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
2011-11-01 12:09:29 -07:00
Ying Wang
531bdb546a Build cache.img.
Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
2011-11-01 10:44:19 -07:00
Ying Wang
178ef923ac Fix build.
Change-Id: I166d4e0c5cc4d2b58c7af3f0207b2d161a9d1715
2011-10-31 18:13:30 -07:00
Ying Wang
bd93d425ae Unify the user image building code
Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
2011-10-31 17:11:35 -07:00
Jean-Baptiste Queru
e7d25da929 am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP master
* commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':
2011-10-28 15:28:28 +00:00
Ying Wang
e0c60125b9 Merge "Add TARGET_COPY_OUT_* variables." 2011-10-27 15:39:02 -07:00
Ying Wang
2b6aaa367a Add TARGET_COPY_OUT_* variables.
They are relative to PRODUCT_OUT so can be used in PRODUCT_COPY_FILES.
If TARGET_COPY_OUT_VENDOR instead of hardcoded system/vendor is used, we
will be able to transition smoothly to a separate vendor staging directory.

Change-Id: Ia9fdb208768cf4699180306280b4c02421b2ea9c
2011-10-27 15:18:39 -07:00