Ying Wang
3da13457cf
am 4b030617
: Merge "XCode 4.3+ compatibility check-in"
...
* commit '4b030617e74405779c657b98fa2b2e521adf4908':
XCode 4.3+ compatibility check-in
2012-06-07 12:00:21 -07:00
Ying Wang
4b030617e7
Merge "XCode 4.3+ compatibility check-in"
2012-06-07 11:25:37 -07:00
Al Sutton
51f9bb02da
XCode 4.3+ compatibility check-in
...
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.
Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com >
2012-06-07 19:10:13 +01:00
Ying Wang
e534e2eb2b
am 47450542
: Merge "Use Mac OS X SDK 10.6."
...
* commit '47450542a3d07eb79c80035c701638b1f07eb1c0':
Use Mac OS X SDK 10.6.
2012-06-05 15:23:30 -07:00
Ying Wang
47450542a3
Merge "Use Mac OS X SDK 10.6."
2012-06-05 15:14:53 -07:00
Ying Wang
644dc164cc
Use Mac OS X SDK 10.6.
...
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-06-05 14:23:22 -07:00
Jean-Baptiste Queru
a2bfde63b7
am fed2587c
: Merge "dalvik heapsize: Remove obsolete flag, set porperty"
...
* commit 'fed2587c164d27de79ca7900e920a15cbf62f990':
dalvik heapsize: Remove obsolete flag, set porperty
2012-05-24 14:27:52 -07:00
Jean-Baptiste Queru
9f312b8156
am 3deea32a
: Merge "Enable DRM support in the SDK system image"
...
* commit '3deea32a31e16d92d1d632b5a1bd260416f6e7d5':
Enable DRM support in the SDK system image
2012-05-24 14:27:51 -07:00
Jean-Baptiste Queru
fed2587c16
Merge "dalvik heapsize: Remove obsolete flag, set porperty"
2012-05-24 12:38:34 -07:00
Bruce Beare
5b21303927
dalvik heapsize: Remove obsolete flag, set porperty
...
Change-Id: I51360867171aaebce071b3391678ff6e7f191dc5
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2012-05-24 11:38:18 -07:00
Jean-Baptiste Queru
3deea32a31
Merge "Enable DRM support in the SDK system image"
2012-05-24 10:14:05 -07:00
Jean-Baptiste Queru
27a4fa10a9
am 2d0055dd
: Merge "Revert "Add module \'idmap\'.""
...
* commit '2d0055dd3d3f067ef0ab2db6f8358b69d60880d9':
Revert "Add module 'idmap'."
2012-05-23 16:14:45 -07:00
Jean-Baptiste Queru
2d0055dd3d
Merge "Revert "Add module 'idmap'.""
2012-05-23 16:06:08 -07:00
Jean-Baptiste Queru
4412133fb8
Revert "Add module 'idmap'."
...
This reverts commit eb7c4a5e9e
.
2012-05-23 16:03:14 -07:00
Jean-Baptiste Queru
372936d881
am c47b90a9
: Merge "Add module \'idmap\'."
...
* commit 'c47b90a9a94b7f1cb452f0f0aa73696e382fe3c3':
Add module 'idmap'.
2012-05-23 15:58:49 -07:00
Jean-Baptiste Queru
c47b90a9a9
Merge "Add module 'idmap'."
2012-05-23 14:40:00 -07:00
Jean-Baptiste Queru
72b329e504
am 3c5191c6
: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
...
* commit '3c5191c61ac25a8dcdfdac61d591d66e3d20e380':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
2012-05-21 08:07:59 -07:00
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
62855a83b8
am 2436ea8a
: Merge "Use i686-linux-android-4.6 for x86 build"
...
* commit '2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
Use i686-linux-android-4.6 for x86 build
2012-05-16 07:55:00 -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
cced446c7f
am 9db21482
: Merge "stop using a custom linker script for static executables."
...
* commit '9db21482369c20120d6f4c1078ce7e0405ba3148':
stop using a custom linker script for static executables.
2012-05-15 16:39:59 -07:00
Nick Kralevich
9db2148236
Merge "stop using a custom linker script for static executables."
2012-05-15 15:09:25 -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
Jean-Baptiste Queru
7eb749d134
am 2d7274de
: Merge "MIPS generic target support"
...
* commit '2d7274de30e35eb13d2934707601ef91ce0f6d4d':
MIPS generic target support
2012-05-11 21:51:52 -07:00
Jean-Baptiste Queru
2d7274de30
Merge "MIPS generic target support"
2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
0e2bc24ef0
am cd99ece7
: Merge "x86: customize the malloced address to be 16-byte aligned"
...
* commit 'cd99ece706771d4141b8fc51104224946cf1df65':
x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:09:16 -07:00
Jean-Baptiste Queru
cd99ece706
Merge "x86: customize the malloced address to be 16-byte aligned"
2012-05-11 11:25:11 -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
Raghu Gandham
b53cc7a82b
MIPS generic target support
...
Change-Id: I76506eba9d11867e53069c97038996bddd7dd5a2
Signed-off-by: Chris Dearman <chris@mips.com >
Signed-off-by: Raghu Gandham <raghu@mips.com >
Signed-off-by: Duane Sand <duanes@mips.com >
Signed-off-by: Bhanu Chetlapalli <bhanu@mips.com >
2012-05-08 11:53:47 -07:00
Jack Ren
6f28d9750c
x86: customize the malloced address to be 16-byte aligned
...
That can gain better memory performance than 8-byte alignment
Change-Id: Ibcc5bf7b96ed10166038357dd0c86c9171768f3e
Signed-off-by: Jack Ren <jack.ren@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2012-05-08 13:38:25 +08:00
Jean-Baptiste Queru
b031afab54
am bf3d3287
: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
...
* commit 'bf3d3287acad729c5db51df24ba443ea0d94c9aa':
Use the same compilation flags on OS X 10.8 as 10.7
2012-05-07 13:56:19 -07:00
Jean-Baptiste Queru
bf3d3287ac
Merge "Use the same compilation flags on OS X 10.8 as 10.7"
2012-05-07 09:34:39 -07: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
Jun Tian
020e159f2d
Enable DRM support in the SDK system image
...
Move the DRM packages from full_base.mk to core.mk to support DRM both on full and SDK building.
It can fix the DRM CTS failures in the system image for emulator.
Change-Id: Id12b0ca83a815aac90860230582882e370693522
2012-05-04 10:36:03 +08:00
Jean-Baptiste Queru
6dfbf0240b
am 9e4e3b37
: Merge "TARGET_linux-arm.mk: use single slash version of -print-whatever"
...
* commit '9e4e3b378fd9a62651e216f18dc26cf2b877412a':
TARGET_linux-arm.mk: use single slash version of -print-whatever
2012-05-02 17:03:12 -07: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
Jean-Baptiste Queru
343597c3aa
am c45cb0bf
: Merge "Enable sound effect support in the SDK system image"
...
* commit 'c45cb0bf074b6fec4e9810cfa442cf1c89645dd7':
Enable sound effect support in the SDK system image
2012-05-02 13:02:26 -07:00
Jean-Baptiste Queru
c45cb0bf07
Merge "Enable sound effect support in the SDK system image"
2012-05-02 12:20:16 -07:00
Jun Tian
07fe2cf7b4
Enable sound effect support in the SDK system image
...
Add the missing configuration in sdk.mk to support sound effect in the SDK building.
This patch can fix the CTS sound effect failues of media test in emulator system image.
Change-Id: I8c22e62201d48c2e56fb4c105795bb96ded8f34d
2012-05-02 12:18:52 -07:00
Jean-Baptiste Queru
8571ee478e
am f562adc8
: Merge "Force use of compatibility compilers on Apple\'s command line tools"
...
* commit 'f562adc85f05b17c2c10993f3da07e61a7a24b74':
Force use of compatibility compilers on Apple's command line tools
2012-05-02 11:27:36 -07:00
Jean-Baptiste Queru
a4354dd8ce
am 2ba46ecd
: Merge "Add Esperanto to the list of locales"
...
* commit '2ba46ecdc4bca804ffedc38694910dc1322b42d1':
Add Esperanto to the list of locales
2012-05-02 11:27:35 -07:00
Jean-Baptiste Queru
f562adc85f
Merge "Force use of compatibility compilers on Apple's command line tools"
2012-05-02 09:40:13 -07:00
Jean-Baptiste Queru
2ba46ecdc4
Merge "Add Esperanto to the list of locales"
2012-05-02 07:39:16 -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
Raphael Moll
c094c0a68f
am d0831659
: Merge "Split target/product/sdk.mk into sdk.git"
...
* commit 'd0831659af544b93f3a9592a1cd4f85ff89e8635':
Split target/product/sdk.mk into sdk.git
2012-04-23 15:43:35 -07:00
The Android Open Source Project
76f57fe373
Reconcile with ics-mr1-release
...
Change-Id: I7c50185d28ff8b3818d66b2e232e5e5507fa7902
2012-04-23 14:40:15 -07:00
Raphael Moll
d0831659af
Merge "Split target/product/sdk.mk into sdk.git"
2012-04-23 12:44:00 -07:00
Jean-Baptiste Queru
695a2b3fd9
am 9b16b129
: Merge "Switch to new locations of toolchains"
...
* commit '9b16b1293255be054a84e6f39098c7a35357f636':
Switch to new locations of toolchains
2012-04-23 09:23:58 -07:00
Jean-Baptiste Queru
9b16b12932
Merge "Switch to new locations of toolchains"
2012-04-23 08:31:53 -07:00