The Android Automerger
8246871768
JRN46D
2012-05-16 16:50:44 -07:00
The Android Automerger
4ab2f9ce86
JRN46C
2012-05-16 15:52:26 -07:00
Jean-Baptiste Queru
feec98b139
resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp
...
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
2012-05-16 13:18:39 -07:00
The Android Automerger
838ebb2e94
JRN46B
2012-05-16 12:47:02 -07:00
Nick Kralevich
f760bcbae2
am cced446c: am 9db21482: Merge "stop using a custom linker script for static executables."
...
* commit 'cced446c7fb11412e100a579a9ba1ef051e24686':
stop using a custom linker script for static executables.
2012-05-16 09:14:24 -07:00
The Android Open Source Project
a3c0f0e32c
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I17f88425d34e570293c17fb39d92f363e982c002
2012-05-16 08:39:57 -07:00
The Android Automerger
9a0e2f8673
JFN46
2012-05-16 07:56:08 -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
The Android Automerger
64019fbafa
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:42:57 -07:00
The Android Automerger
ad13a75a5d
JRN46
2012-05-16 07:10:44 -07:00
The Android Automerger
09343f4fc4
merge in jb-release history after reset to jb-dev
2012-05-16 06:59:25 -07:00
Jean-Baptiste Queru
2436ea8a8c
Merge "Use i686-linux-android-4.6 for x86 build"
2012-05-16 06:42:55 -07:00
James Dong
3ffbea3dcf
am 4007faf4: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit '4007faf4c6bb99883f6ac7a8d80a956837909ff8':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-16 01:22:31 -07:00
James Dong
4007faf4c6
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
2012-05-16 01:17:42 -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
The Android Automerger
129c58f44b
JRN45B
2012-05-15 15:51:10 -07:00
Ying Wang
182a7e170b
am f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
...
* commit 'f446039efb2e4d8a520c8f83dabc375c6d1370dd':
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
2012-05-15 15:20:01 -07:00
Ying Wang
f446039efb
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
2012-05-15 15:16:33 -07:00
Nick Kralevich
9db2148236
Merge "stop using a custom linker script for static executables."
2012-05-15 15:09:25 -07:00
James Dong
4d5c4dc3e0
am c8bfb1ca: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
...
* commit 'c8bfb1cad15822f31e3f3250d00b4ef6761c19c4':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
2012-05-15 14:59:09 -07:00
James Dong
c8bfb1cad1
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
...
Fixed the broken build first.
This reverts commit e85f05be14
2012-05-15 14:47:37 -07:00
Ying Wang
6e371e426f
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
...
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
2012-05-15 14:31:26 -07:00
James Dong
a0404bf3b7
am e85f05be: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
* commit 'e85f05be147bf7d916d1b1622f6f3038dac8913b':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
2012-05-15 14:27:02 -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
The Android Automerger
79154b1425
JFN45
2012-05-15 09:38:40 -07:00
The Android Automerger
fced96ebe2
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-15 09:33:03 -07:00
The Android Automerger
95d04d0652
JRN45
2012-05-15 07:11:21 -07:00
The Android Automerger
535b6a6ae7
merge in jb-release history after reset to jb-dev
2012-05-15 06:59:25 -07:00
James Dong
e85f05be14
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
...
related-to-bug: 6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
2012-05-15 00:45:45 -07:00
Ying Wang
6b524cf591
am 3ceecfa3: Check the well-formedness of an xml file before copying.
...
* commit '3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
Check the well-formedness of an xml file before copying.
2012-05-14 19:34:26 -07:00
The Android Automerger
267de65815
JRN44C
2012-05-14 17:49:29 -07:00
The Android Automerger
5b2c7ae067
JRN44B
2012-05-14 15:57:17 -07:00
Ying Wang
3ceecfa3da
Check the well-formedness of an xml file before copying.
...
Bug: 6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
2012-05-14 14:40:58 -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
The Android Automerger
fe61a0bc13
JRN44
2012-05-14 07:09:46 -07:00
The Android Automerger
5b791af4f9
merge in jb-release history after reset to jb-dev
2012-05-14 06:59:29 -07:00
The Android Automerger
917fc02fb6
JRN40I
2012-05-12 14:36:59 -07:00
Jean-Baptiste Queru
44fd5580b5
am 7eb749d1: am 2d7274de: Merge "MIPS generic target support"
...
* commit '7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
MIPS generic target support
2012-05-11 21:53:54 -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
The Android Automerger
b705c02fe9
JRN40H take three
2012-05-11 21:30:39 -07:00
The Android Automerger
32f243670a
JRN40H take two
2012-05-11 18:03:22 -07:00
Victoria Lease
057366e21d
am 67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
...
* commit '67095e005c48c639954d4ada60f391ff4923f0eb':
Parse external/cibu-fonts/fonts.mk.
2012-05-11 16:54:00 -07:00
Victoria Lease
67095e005c
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
2012-05-11 16:51:47 -07:00
The Android Automerger
99956ed9d8
JRN40H
2012-05-11 16:29:04 -07:00
The Android Automerger
3dbf4c94aa
JRN40G
2012-05-11 16:04:09 -07:00
Jean-Baptiste Queru
2d7274de30
Merge "MIPS generic target support"
2012-05-11 14:46:38 -07:00
Jean-Baptiste Queru
8ff07372c1
am 0e2bc24e: am cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
...
* commit '0e2bc24ef002ec612e94a64da297a7698acde749':
x86: customize the malloced address to be 16-byte aligned
2012-05-11 14:12:10 -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
The Android Automerger
e2bcb9e516
JRN40F
2012-05-11 12:30:28 -07:00
The Android Automerger
17f197fcbf
JRN41
2012-05-11 11:41:47 -07:00
