Commit graph

1964 commits

Author SHA1 Message Date
Jean-Baptiste Queru
3c5191c61a Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES" 2012-05-21 07:30:17 -07:00
Jean-Baptiste Queru
2436ea8a8c Merge "Use i686-linux-android-4.6 for x86 build" 2012-05-16 06:42:55 -07:00
Nick Kralevich
ee08fe3196 stop using a custom linker script for static executables.
This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
2012-05-15 10:40:35 -07:00
H.J. Lu
402d7f3654 Use i686-linux-android-4.6 for x86 build
Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
2012-05-14 08:22:27 -07:00
Kito Cheng
61c37e7a4f Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Change-Id: I9ff53f51dcb57511a24765bdf6a61c000a7ce977

Signed-off-by: Kito Cheng <kito@0xlab.org>
2012-05-09 23:54:45 +08:00
Al Sutton
35bb6422bc Use the same compilation flags on OS X 10.8 as 10.7
Added Mountain Lion to the list of versions which don't need ranlib
and don't need the pre-Lion linker flags

Change-Id: I0c785f0c66e324af9a209520c5a5b3c9bf7df0d5
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-05-07 09:44:28 +01:00
Jean-Baptiste Queru
9e4e3b378f Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever" 2012-05-02 13:26:50 -07:00
Al Sutton
0d07c732c7 Force use of compatibility compilers on Apple's command line tools
The cc and c++ compilers included in Apple's command line tools show some
unusual behaviour which causes the build to fail in several projects under
Xcode 4.3

This patch uses the gnu compatibility gcc and g++ compilers on OS X instead
to reduce problems, and generates an error when an llvm based compiler is
detected because they currently do not generate usable emulator executables
due to them not honouring global register variables.

Change-Id: I506c22dad3dcbd41df3c7672802a675d3655e262
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-05-02 07:11:27 -07:00
Jean-Baptiste Queru
a50ef1c124 Switch to new locations of toolchains
Change-Id: I15a8be11b3d0f1985ffd97dd51a1af18e1ce7b67
2012-04-20 16:15:42 -07:00
Jing Yu
c856e31523 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
2012-04-20 07:53:16 -07:00
Doug Kwan
422a3650d3 Fix build problems with gcc-4.6.x.
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
2012-04-20 07:52:47 -07:00
Raphael Moll
b3700ab773 Merge "SDK: Also read sdk/build/tools.OS.atree"
This allows us to have per-host OS (or OS + arch) atree files in case we
need to get tools which source varies per host OS, example:
- sdk/build/tools.linux.atree
- sdk/build/tools.linux-x86_64.atree
- sdk/build/tools.windows.atree
etc.

(cherry picked from commit 3ab307a68c)

Change-Id: I05140bb02ecd41152e47ecdf404b1b8fb34fdf24
2012-04-10 12:21:46 -07:00
Jean-Baptiste Queru
64cd96ce7f Bump DX Java heap to 2GB.
Change-Id: I240a24f9bb8511fea8f420f76b4541018ae79a0c
2012-04-10 08:21:21 -07:00
Stephen Smalley
56882bf9b4 Support the setting of file security contexts in OTA and update packages.
Pass the file_contexts configuration to the releasetools scripts
so that the security contexts of files can be properly set for OTA
and update packages.

Requires Ica5fb73d6f2ffb981b74d1896538988dbc4d9b24

Change-Id: I5a63fd61a7e74d386d0803946d06bcf2fa8a857e
2012-04-06 15:35:41 -04:00
Stephen Smalley
5042392262 Pass the file_contexts configuration to mkyaffs2image and make_ext4fs.
This configuration is used to determine the file security contexts
to set on the files in the yaffs2 or ext4 image that is generated.
This is similar to the android_filesystem_config.h tables for determining
the UID/GID/mode, but as a configuration rather than code.

Change-Id: I7c6f59fe7cb8bc4c86c8790f991b12dd93a61f68
2012-04-06 15:34:37 -04:00
Raphael Moll
b6addfb250 am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
  Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:53:32 -07:00
Raphael Moll
2696eb6d11 am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
  SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
Raphael Moll
4c45699015 Allow make 3.82 to be used under Cygwin 1.7
(Manual merge of 76bf62d75e)

Change-Id: I61a6b10b4d81192dbff928780c2263931cf57c4d
2012-03-27 14:35:34 -07:00
Raphael Moll
3b1ebe7dc2 Merge "SDK atree: support HOST_OUT location." 2012-03-27 11:40:47 -07:00
Jean-Baptiste Queru
d17c89776e am 0b6a436f: Merge "Fix build"
* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
  Fix build
2012-03-27 08:07:09 -07:00
Glenn Kasten
f396f56817 Fix build
Change-Id: I740b211588122b1198d7925c78e9a4a7aaf08784
2012-03-27 07:24:24 -07:00
Andrew Hsieh
5d9aedef30 am 2245d17d: Point to new linux prebuilt toolchain for SDK build
* commit '2245d17dc847ecb5371807466788552ca0198152':
  Point to new linux prebuilt toolchain for SDK build
2012-03-22 11:03:14 -07:00
Andrew Hsieh
2245d17dc8 Point to new linux prebuilt toolchain for SDK build
Change-Id: I21849119b0f3f45f950e9e6d1da0833aff381fb7
2012-03-22 09:55:36 -07:00
Raphael Moll
74160ed4c4 SDK atree: support HOST_OUT location.
Change-Id: Ib369280971b37a3eb35ac94991cdbc49dead903e
2012-03-21 22:34:48 -07:00
Ying Wang
301843ae3e am 29e44b7a: Merge "Fix for "dexopt: No such file or directory" error"
* commit '29e44b7a8300644516b021e9e324ffe426098b3f':
  Fix for "dexopt: No such file or directory" error
2012-03-20 15:20:14 -07:00
Ying Wang
29e44b7a83 Merge "Fix for "dexopt: No such file or directory" error" 2012-03-20 11:05:56 -07:00
Jean-Baptiste Queru
9950526875 am 20b970e2: Merge "Issue warning when "make snod" with dexpreopt enabled."
* commit '20b970e25227c4144c61d0d6108905616dc4f08b':
  Issue warning when "make snod" with dexpreopt enabled.
2012-02-24 11:32:08 -08:00
Ying Wang
acf01ec837 Issue warning when "make snod" with dexpreopt enabled.
Change-Id: I481f963634dd384ed6d3de73dfeeda92b37d227e
2012-02-24 11:05:48 -08:00
Jean-Baptiste Queru
605643224e Move AOSP to another fake version number
Change-Id: Ida0282d1eccaa2bdaf4ca54aaf82680efdbaa271
2012-02-15 14:04:45 -08:00
Raphael Moll
c04b56c5b0 Merge "Move Windows SDK whitelist out of main.mk"
This replaces the list maintained in build/core/main.mk
by 2 makefiles in sdk.git and development.git.

Pre-requisite CLs: Change Ifa8111dbae for sdk.git
and Change Ie6f728bee for development.git

(cherry-pick of 347f305181)

Change-Id: I6d1f4c974a6425e50e3e287c66a4e8090cf814cb
2012-02-14 11:12:02 -08:00
Conley Owens
5f1c9ba0b8 Add extra environment info to build output
This should help us support users with build issues.
Given that they inculde the dumpvars in their error report,
we will be able to avoid asking standard questions like
"what version of Ubuntu are you using?"

Change-Id: Ib7c452d805d5e64075a44dc40e41d4605cc1ef4a
2012-02-07 11:16:42 -08:00
Jim Huang
5d84f1659f TARGET_linux-arm.mk: use single slash version of -print-whatever
The double slash variants are not documented in GCC manual.  Therefore,
it is better to use the single slash variants as usual.
2012-01-31 11:11:29 +08:00
Haruyasu Ishida
5c97da76ad Fix for "dexopt: No such file or directory" error
When common_javalib.jar is created, both LOCAL_BUILT_MODULE and
built_odex targets can be run.

If built_odex target runs before the directory is created by
LOCAL_BUILT_MODULE target, the error occurs.

Change-Id: I1ebcb27630f8373558da6acdfce95f5cdf714bbf
2012-01-27 09:25:20 +01:00
Xavier Ducrohet
4b5e4ba5fd Remove mention of layoutopt/uix as they are gone. 2012-01-11 18:07:31 -08:00
Jean-Baptiste Queru
5ea72effbd Use the new location of the emulator kernel 2012-01-06 17:02:24 -08:00
Jean-Baptiste Queru
a230c4d049 Reference kernel notice in the new location 2012-01-06 15:05:53 -08:00
Al Sutton
80cfc37d0f Partial fix for emulator under Lion.
Don't use -Wl,-dynamic on Lion
2012-01-04 15:16:50 -08:00
Conley Owens
d38c870d2e Get build system to work with Make 3.82
Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
2011-12-22 15:16:05 -08:00
Al Sutton
9ce06f11d6 Don't run ranlib on MacOS 10.7
Change-Id: I74f4623e6044dd804669aaa70c6e410fa8988d75
2011-12-21 13:12:33 -08:00
Atte Peltomaki
60fe963c63 build: explicitly define dependency files
Groundwork for distcc support in Android build system,
see distcc FAQ for details on why -MF is needed:
http://distcc.googlecode.com/svn/trunk/doc/web/faq.html
2011-12-21 09:24:09 -08:00
Bruce Beare
b056d71f79 If setupwizard is disabled, don't force it to optional
Change-Id: I15912ed77b88ea94feb149fdd081a309e3cf4678
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-19 09:51:40 -08:00
Brian Muramatsu
80fa947b03 am fea66cee: Merge "Build Support for CTS Native Tests" into ics-mr1
* commit 'fea66cee1cd661b6bf8ead1988cf008fa61b01a7':
  Build Support for CTS Native Tests
2011-12-14 15:33:22 -08:00
Brian Muramatsu
237fa07339 Build Support for CTS Native Tests
Bug 4970300

Adds two new variables, CTS_TEST_CASES and CTS_TEST_XMLS, to be read
from CtsTestCaseList.mk. The CTS_TEST_CASES variable can be used to
copy any sort of file to the repository/testcases CTS directory.
The CTS_TEST_XMLS variable can be used to inject test package xmls
from any source rather than relying upon the monolithic and
mostly serial buildCts.py script.

The existing CTS_CORE_CASE_LIST is coded to only support APKs, so
it could not be retrofitted to support native tests. However, the
two new variables can do even more than CTS_CORE_CASE_LIST due to
their generality. In the future, the idea is move away from
CTS_CORE_CASE_LIST and also generate XMLs using separate tools
rather than just buildCts.py.

Change-Id: Ib52722861c37e0f4d511f9041928395bcaba5dea
2011-12-13 14:14:36 -08:00
Jean-Baptiste Queru
a2c1261e71 Set version numbers for AOSP - do not merge
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
2011-12-12 17:16:07 -08:00
Bruce Beare
381581613a am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92':
  x86: The default ATOM BSP flags need to be in sync with the NDK ABI
2011-12-09 16:21:00 -08:00
Bruce Beare
3343b27c53 x86: The default ATOM BSP flags need to be in sync with the NDK ABI
Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-09 13:27:08 -08:00
Dianne Hackborn
d7b15982d2 am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
  Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.
2011-12-07 10:34:21 -08:00
Dianne Hackborn
e73b24ccbe Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
Jean-Baptiste Queru
0cd997ff31 am 8af0efd6: Improve handling of absolute paths in out directory
* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
  Improve handling of absolute paths in out directory
2011-12-06 19:32:38 -08:00
Jean-Baptiste Queru
78b680458b am ffe03c98: Set OUT_DIR based on a common base path
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
  Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00