OSDN Git Service
Jean-Baptiste Queru [Mon, 21 May 2012 15:10:26 +0000 (08:10 -0700)]
am
72b329e5: am
3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
* commit '
72b329e5042b8fc15cbcbea3d382a072f79eb961':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Jean-Baptiste Queru [Mon, 21 May 2012 15:07:59 +0000 (08:07 -0700)]
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
Jean-Baptiste Queru [Mon, 21 May 2012 14:30:15 +0000 (07:30 -0700)]
Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
The Android Open Source Project [Sat, 19 May 2012 01:41:56 +0000 (18:41 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ic5f9f074942c800ffb75e0c36212a8143a5b06f6
The Android Automerger [Fri, 18 May 2012 22:21:39 +0000 (15:21 -0700)]
JRN47D
The Android Automerger [Fri, 18 May 2012 21:55:08 +0000 (14:55 -0700)]
JRN48
The Android Automerger [Fri, 18 May 2012 19:32:30 +0000 (12:32 -0700)]
JFN47C take 3
The Android Automerger [Fri, 18 May 2012 19:31:42 +0000 (12:31 -0700)]
JFN47C
The Android Automerger [Fri, 18 May 2012 19:16:59 +0000 (12:16 -0700)]
JFN47C take 2
The Android Automerger [Fri, 18 May 2012 18:37:02 +0000 (11:37 -0700)]
JFN47C
The Android Automerger [Fri, 18 May 2012 17:54:03 +0000 (10:54 -0700)]
JFN48
The Android Automerger [Fri, 18 May 2012 17:45:30 +0000 (10:45 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Andrew Hsieh [Fri, 18 May 2012 07:53:35 +0000 (15:53 +0800)]
Add -mno-movbe to disable "movbe" instruction from code-gen
Intruction "movbe" (move data after swapping bytes) is only available in
Intel atom. Disable it for more general x86 devices and x86 hosts which
run emulator-x86. Although emulator-x86 can support "movbe", most of
the time we want to run emulator-x86 with VT support for speed (with KVM
in Linux, or HAXM in Windows/MacOSX). The presence of "movbe" can crash
emulator-x86 in VT because non-atom host doesn't have it natively.
Change-Id: I86e037900ddcb8d544f92b8d8464c8627347e560
The Android Automerger [Thu, 17 May 2012 22:51:47 +0000 (15:51 -0700)]
JRN47C
The Android Automerger [Thu, 17 May 2012 22:05:00 +0000 (15:05 -0700)]
JRN47B
The Android Automerger [Thu, 17 May 2012 16:27:59 +0000 (09:27 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 16:25:37 +0000 (09:25 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 17 May 2012 16:25:00 +0000 (09:25 -0700)]
force version reset
The Android Automerger [Thu, 17 May 2012 14:11:04 +0000 (07:11 -0700)]
JRN47
The Android Automerger [Thu, 17 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 23:50:44 +0000 (16:50 -0700)]
JRN46D
The Android Automerger [Wed, 16 May 2012 22:52:26 +0000 (15:52 -0700)]
JRN46C
Jean-Baptiste Queru [Wed, 16 May 2012 20:18:39 +0000 (13:18 -0700)]
resolved conflicts for merge of
62855a83 to jb-dev-plus-aosp
Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
The Android Automerger [Wed, 16 May 2012 19:47:02 +0000 (12:47 -0700)]
JRN46B
Nick Kralevich [Wed, 16 May 2012 16:14:24 +0000 (09:14 -0700)]
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.
The Android Open Source Project [Wed, 16 May 2012 15:39:57 +0000 (08:39 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I17f88425d34e570293c17fb39d92f363e982c002
The Android Automerger [Wed, 16 May 2012 14:56:08 +0000 (07:56 -0700)]
JFN46
Jean-Baptiste Queru [Wed, 16 May 2012 14:55:00 +0000 (07:55 -0700)]
am
2436ea8a: Merge "Use i686-linux-android-4.6 for x86 build"
* commit '
2436ea8a8c84d58befb4bf27d137d94c45b8cc8d':
Use i686-linux-android-4.6 for x86 build
The Android Automerger [Wed, 16 May 2012 14:42:57 +0000 (07:42 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Wed, 16 May 2012 14:10:44 +0000 (07:10 -0700)]
JRN46
The Android Automerger [Wed, 16 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Jean-Baptiste Queru [Wed, 16 May 2012 13:42:53 +0000 (06:42 -0700)]
Merge "Use i686-linux-android-4.6 for x86 build"
James Dong [Wed, 16 May 2012 08:22:31 +0000 (01:22 -0700)]
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
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6502980
Change-Id: I02a735ff4897ed386fe9c5d886260b1363a1e019
Nick Kralevich [Tue, 15 May 2012 23:39:59 +0000 (16:39 -0700)]
am
9db21482: Merge "stop using a custom linker script for static executables."
* commit '
9db21482369c20120d6f4c1078ce7e0405ba3148':
stop using a custom linker script for static executables.
The Android Automerger [Tue, 15 May 2012 22:51:10 +0000 (15:51 -0700)]
JRN45B
Ying Wang [Tue, 15 May 2012 22:20:01 +0000 (15:20 -0700)]
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.
Ying Wang [Tue, 15 May 2012 22:16:33 +0000 (15:16 -0700)]
Merge "Don't set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
Nick Kralevich [Tue, 15 May 2012 22:09:25 +0000 (15:09 -0700)]
Merge "stop using a custom linker script for static executables."
James Dong [Tue, 15 May 2012 21:59:09 +0000 (14:59 -0700)]
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.
James Dong [Tue, 15 May 2012 21:47:37 +0000 (14:47 -0700)]
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
Fixed the broken build first.
This reverts commit
e85f05be147bf7d916d1b1622f6f3038dac8913b.
Ying Wang [Tue, 15 May 2012 21:31:26 +0000 (14:31 -0700)]
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
James Dong [Tue, 15 May 2012 21:27:02 +0000 (14:27 -0700)]
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
Nick Kralevich [Tue, 1 Nov 2011 17:59:35 +0000 (10:59 -0700)]
stop using a custom linker script for static executables.
This is causing problems with making the linker relocatable.
Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
The Android Automerger [Tue, 15 May 2012 16:38:40 +0000 (09:38 -0700)]
JFN45
The Android Automerger [Tue, 15 May 2012 16:33:03 +0000 (09:33 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Automerger [Tue, 15 May 2012 14:11:21 +0000 (07:11 -0700)]
JRN45
The Android Automerger [Tue, 15 May 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
James Dong [Tue, 15 May 2012 07:45:19 +0000 (00:45 -0700)]
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug:
6328360
Change-Id: Ia320d417497bc410f99f8ff7f11c727d1299afba
Ying Wang [Tue, 15 May 2012 02:34:26 +0000 (19:34 -0700)]
am
3ceecfa3: Check the well-formedness of an xml file before copying.
* commit '
3ceecfa3daeb187c0631a84e6ee6b4dd89f111f8':
Check the well-formedness of an xml file before copying.
The Android Automerger [Tue, 15 May 2012 00:49:29 +0000 (17:49 -0700)]
JRN44C
The Android Automerger [Mon, 14 May 2012 22:57:17 +0000 (15:57 -0700)]
JRN44B
Ying Wang [Mon, 14 May 2012 21:39:00 +0000 (14:39 -0700)]
Check the well-formedness of an xml file before copying.
Bug:
6491991
Change-Id: I3dbf9a7e1fefd9fea2636c78a85bae63ea8391b8
H.J. Lu [Sun, 29 Apr 2012 14:34:54 +0000 (07:34 -0700)]
Use i686-linux-android-4.6 for x86 build
Change-Id: Ibbb0a899f147013503d6830bb93050c5ae588539
Author: "H.J. Lu" <hongjiu.lu@intel.com>
The Android Automerger [Mon, 14 May 2012 14:09:46 +0000 (07:09 -0700)]
JRN44
The Android Automerger [Mon, 14 May 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 12 May 2012 21:36:59 +0000 (14:36 -0700)]
JRN40I
Jean-Baptiste Queru [Sat, 12 May 2012 04:53:54 +0000 (21:53 -0700)]
am
7eb749d1: am
2d7274de: Merge "MIPS generic target support"
* commit '
7eb749d134fd52e23be7218bf2ea7dfa1b1180b3':
MIPS generic target support
Jean-Baptiste Queru [Sat, 12 May 2012 04:51:52 +0000 (21:51 -0700)]
am
2d7274de: Merge "MIPS generic target support"
* commit '
2d7274de30e35eb13d2934707601ef91ce0f6d4d':
MIPS generic target support
The Android Automerger [Sat, 12 May 2012 04:30:39 +0000 (21:30 -0700)]
JRN40H take three
The Android Automerger [Sat, 12 May 2012 01:03:22 +0000 (18:03 -0700)]
JRN40H take two
Victoria Lease [Fri, 11 May 2012 23:54:00 +0000 (16:54 -0700)]
am
67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
* commit '
67095e005c48c639954d4ada60f391ff4923f0eb':
Parse external/cibu-fonts/fonts.mk.
Victoria Lease [Fri, 11 May 2012 23:51:47 +0000 (16:51 -0700)]
Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
The Android Automerger [Fri, 11 May 2012 23:29:04 +0000 (16:29 -0700)]
JRN40H
The Android Automerger [Fri, 11 May 2012 23:04:09 +0000 (16:04 -0700)]
JRN40G
Jean-Baptiste Queru [Fri, 11 May 2012 21:46:37 +0000 (14:46 -0700)]
Merge "MIPS generic target support"
Jean-Baptiste Queru [Fri, 11 May 2012 21:12:10 +0000 (14:12 -0700)]
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
Jean-Baptiste Queru [Fri, 11 May 2012 21:09:16 +0000 (14:09 -0700)]
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
The Android Automerger [Fri, 11 May 2012 19:30:28 +0000 (12:30 -0700)]
JRN40F
The Android Automerger [Fri, 11 May 2012 18:41:47 +0000 (11:41 -0700)]
JRN41
Jean-Baptiste Queru [Fri, 11 May 2012 18:25:10 +0000 (11:25 -0700)]
Merge "x86: customize the malloced address to be 16-byte aligned"
Doug Zongker [Fri, 11 May 2012 17:44:38 +0000 (10:44 -0700)]
am
7bb04231: add copy of public cert used for signing to OTA packages
* commit '
7bb042317ab4df86b9962f30399c7728e8b84599':
add copy of public cert used for signing to OTA packages
Jean-Baptiste Queru [Fri, 11 May 2012 17:42:24 +0000 (10:42 -0700)]
Merge
3742983d from jb-dev
Change-Id: I6a9d140fdfac55fd0ada1c9c7e3b1d1a7cb8d8c9
Doug Zongker [Fri, 11 May 2012 16:20:50 +0000 (09:20 -0700)]
add copy of public cert used for signing to OTA packages
When signing a file with -w (ie, an OTA package), add the file
META-INF/com/android/otacert, which is a copy of the public key
certificate. While this can be extracted from the CERT.RSA file,
having a copy of it more easily accessible makes it easier to write
tools.
Bug:
6477365
Change-Id: I8cdb19536eca9a223c2b954e3f8ea0d9f3f86f02
Dianne Hackborn [Thu, 10 May 2012 05:14:37 +0000 (22:14 -0700)]
JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
Ying Wang [Fri, 11 May 2012 01:11:23 +0000 (18:11 -0700)]
am
a1ff6290: Now current is also a valid prebuilt SDK.
* commit '
a1ff6290e1e14d48dc42d1eacf804172c5913916':
Now current is also a valid prebuilt SDK.
The Android Automerger [Fri, 11 May 2012 01:09:44 +0000 (18:09 -0700)]
JRN40E
Ying Wang [Fri, 11 May 2012 01:07:33 +0000 (18:07 -0700)]
Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
Ying Wang [Fri, 11 May 2012 00:58:46 +0000 (17:58 -0700)]
am
0ec188f1: Support to build against prebuilt current SDK in unbundled branch
* commit '
0ec188f1c197709cf61d0de647b5220539b97322':
Support to build against prebuilt current SDK in unbundled branch
Ying Wang [Fri, 11 May 2012 00:25:51 +0000 (17:25 -0700)]
Support to build against prebuilt current SDK in unbundled branch
Bug:
6465084
With this change and prebuilt current SDK checked in, you can build
unbundled apps with LOCAL_SDK_VERSION current in an unbundled branch.
Change-Id: I4efcee611d08a3a903bd6bf5a80de11500564206
The Android Automerger [Thu, 10 May 2012 22:00:59 +0000 (15:00 -0700)]
JRN40D
The Android Automerger [Thu, 10 May 2012 19:27:23 +0000 (12:27 -0700)]
JRN40C
Jean-Michel Trivi [Thu, 10 May 2012 17:45:15 +0000 (10:45 -0700)]
am
0c5db81f: Merge "Add OMX IL FLAC encoder library" into jb-dev
* commit '
0c5db81fb28f74491e7f17c6c81ae0b19342ca7c':
Add OMX IL FLAC encoder library
Jean-Michel Trivi [Thu, 10 May 2012 16:54:41 +0000 (09:54 -0700)]
Merge "Add OMX IL FLAC encoder library" into jb-dev
Nick Kralevich [Thu, 10 May 2012 16:24:10 +0000 (09:24 -0700)]
am
ecb1a565: x86: compile everything with relro / bind_now
* commit '
ecb1a565849b40ab7aa45b7fe71e24e29a059376':
x86: compile everything with relro / bind_now
The Android Automerger [Thu, 10 May 2012 15:36:38 +0000 (08:36 -0700)]
JRN40B
The Android Automerger [Thu, 10 May 2012 15:23:04 +0000 (08:23 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Thu, 10 May 2012 14:09:55 +0000 (07:09 -0700)]
JRN40
The Android Automerger [Thu, 10 May 2012 13:59:32 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Wed, 9 May 2012 23:06:13 +0000 (16:06 -0700)]
JRN39D
Jean-Michel Trivi [Fri, 27 Apr 2012 20:38:17 +0000 (13:38 -0700)]
Add OMX IL FLAC encoder library
Bug
5525503
Add the software FLAC encoder OMX IL wrapper to the build.
Change-Id: Iac69558088934e0db41e9cc7fa3fab7e72348568
The Android Automerger [Wed, 9 May 2012 22:59:12 +0000 (15:59 -0700)]
JRN39C
Nick Kralevich [Wed, 9 May 2012 21:49:04 +0000 (14:49 -0700)]
x86: compile everything with relro / bind_now
Enable relro / bind_now when compiling Android applications.
This marks certain regions of memory as read-only after linking,
making memory corruption security vulnerabilities are harder
to exploit.
See:
* http://www.akkadia.org/drepper/nonselsec.pdf (section 6)
* http://tk-blog.blogspot.com/2009/02/relro-not-so-well-known-memory.html
relro support has been enabled for ARM since
233d460f21d372f964f8078b8b0d5fd17af7c6b6.
This change enables it for x86.
Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
The Android Automerger [Wed, 9 May 2012 19:51:17 +0000 (12:51 -0700)]
JRN39B
Kito Cheng [Fri, 20 Jan 2012 11:21:46 +0000 (19:21 +0800)]
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Change-Id: I9ff53f51dcb57511a24765bdf6a61c000a7ce977
Signed-off-by: Kito Cheng <kito@0xlab.org>
The Android Automerger [Wed, 9 May 2012 14:49:20 +0000 (07:49 -0700)]
JRN39
The Android Automerger [Wed, 9 May 2012 14:46:07 +0000 (07:46 -0700)]
merge in jb-release history after reset to jb-dev
Stephen Hines [Wed, 9 May 2012 08:49:45 +0000 (01:49 -0700)]
am
b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev
* commit '
b6956bdd19242cde11b2e9c1f3941585706f3cd3':
Add LLVM_AS to tools.
Jeff Brown [Wed, 9 May 2012 08:45:55 +0000 (01:45 -0700)]
am
8c1028d4: Merge "Add keyboard layout package to build." into jb-dev
* commit '
8c1028d45cfd7892a031e32b4e51bad729ebd2cb':
Add keyboard layout package to build.
Jean-Michel Trivi [Wed, 9 May 2012 08:45:21 +0000 (01:45 -0700)]
am
0acb2064: Merge "Make audio downmixer part of the core platform" into jb-dev
* commit '
0acb2064d7080ab1b3d993cfad66fbf852f9663a':
Make audio downmixer part of the core platform