OSDN Git Service
Jean-Baptiste Queru [Mon, 21 May 2012 21:30:47 +0000 (14:30 -0700)]
am
99e1613f: am
72b329e5: am
3c5191c6: Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"
* commit '
99e1613fd5d3773387b52910d7daa86535f42e25':
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
The Android Open Source Project [Mon, 21 May 2012 21:28:03 +0000 (14:28 -0700)]
am
d172e30a: Reconcile with jb-release nakasi-factoryrom-release
* commit '
d172e30aede4cc0b6751b3015ea6c8c036568aa0':
JRN47D
JRN48
JFN47C take 3
JFN47C
JFN47C take 2
JFN47C
JFN48
JRN47C
JRN47B
JRN47
force version reset
JRN47
JRN46D
JRN46C
JRN46B
Andrew Hsieh [Mon, 21 May 2012 19:44:38 +0000 (12:44 -0700)]
am
112a6747: Add -mno-movbe to disable "movbe" instruction from code-gen
* commit '
112a674798c58052ddce94418e34f3e5a084ed1a':
Add -mno-movbe to disable "movbe" instruction from code-gen
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
Nick Sanders [Fri, 18 May 2012 06:53:01 +0000 (23:53 -0700)]
am
3ccf7686: Move build.prop in factory bundle
* commit '
3ccf7686757824e5e01944a369fc54baf76f95a4':
Move build.prop in factory bundle
Nick Sanders [Fri, 18 May 2012 05:49:47 +0000 (22:49 -0700)]
Move build.prop in factory bundle
Move build.prop to the root dir of the factory bundle for clearer location access.
Change-Id: Ib9a49fd46eb943a1dc5e8e112462f9d601332ca3
Signed-off-by: Nick Sanders <nsanders@google.com>
Joe Onorato [Fri, 18 May 2012 05:15:22 +0000 (22:15 -0700)]
Merge commit '
54973dbc' into work
Conflicts:
core/product.mk
Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
Joe Onorato [Fri, 18 May 2012 05:10:24 +0000 (22:10 -0700)]
Merge commit '
bf2e8a66' into work
Change-Id: I5cd704eb59218b56b48d689afdff84638deeacf1
Joe Onorato [Fri, 18 May 2012 04:34:53 +0000 (21:34 -0700)]
Merge "Add rules to build the factory bundle." into ics-aah
Joe Onorato [Fri, 18 May 2012 03:58:57 +0000 (20:58 -0700)]
Merge "Add copy-many-files macro." into ics-aah
Joe Onorato [Thu, 17 May 2012 18:32:26 +0000 (11:32 -0700)]
Add rules to build the factory bundle.
Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
Joe Onorato [Fri, 18 May 2012 00:12:04 +0000 (17:12 -0700)]
Add copy-many-files macro.
Change-Id: I327fc19bdf9c1ada18b3ba695fe4104e2a241156
The Android Automerger [Thu, 17 May 2012 22:51:47 +0000 (15:51 -0700)]
JRN47C
Jean-Baptiste Queru [Thu, 17 May 2012 22:34:07 +0000 (15:34 -0700)]
am
feec98b1: resolved conflicts for merge of
62855a83 to jb-dev-plus-aosp
* commit '
feec98b139d2ca0b0164a5e178e75ce88b8f492f':
Use i686-linux-android-4.6 for x86 build
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
Ying Wang [Wed, 16 May 2012 17:16:49 +0000 (10:16 -0700)]
Delete unused variable.
Change-Id: I17f0e2c0b911e505c7ddd3c9c9c56e8a38239e17
Nick Kralevich [Wed, 16 May 2012 16:17:30 +0000 (09:17 -0700)]
am
f760bcba: am
cced446c: am
9db21482: Merge "stop using a custom linker script for static executables."
* commit '
f760bcbae298d63a53c710cf8857de6174857e25':
stop using a custom linker script for static executables.
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:42:41 +0000 (08:42 -0700)]
am
a3c0f0e3: Reconcile with jb-release nakasi-factoryrom-release
* commit '
a3c0f0e32c33b1995a7a48eb29b1f65da68e0bae': (228 commits)
JFN46
JRN46
JRN45B
JFN45
JRN45
JRN44C
JRN44B
JRN44
JRN40I
JRN40H take three
JRN40H take two
JRN40H
JRN40G
JRN40F
JRN41
JRN40E
JRN40D
JRN40C
JRN40B
JRN40
...
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:24:25 +0000 (01:24 -0700)]
am
3ffbea3d: am
4007faf4: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '
3ffbea3dcfa79ae930b373070dc52516bf8a6957':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
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.
Ying Wang [Tue, 15 May 2012 22:31:41 +0000 (15:31 -0700)]
Delete the misleading var TARGET_OUT_STATIC_LIBRARIES.
Which can be replaced by TARGET_OUT_INTERMEDIATE_LIBRARIES.
Change-Id: I965ff1ebe70fc3113c19e4896277c876dcedb6a5
The Android Automerger [Tue, 15 May 2012 22:51:10 +0000 (15:51 -0700)]
JRN45B
Ying Wang [Tue, 15 May 2012 22:22:36 +0000 (15:22 -0700)]
am
182a7e17: am
f446039e: Merge "Don\'t set or reference LOCAL_MODULE_PATH for uninstallable modules." into jb-dev
* commit '
182a7e170be196c600e968690bff675ff7ad7069':
Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
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 22:02:22 +0000 (15:02 -0700)]
am
4d5c4dc3: am
c8bfb1ca: Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" Fixed the broken build first.
* commit '
4d5c4dc3e0292d1f528e341babb374c15c34157b':
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: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:29:32 +0000 (14:29 -0700)]
am
a0404bf3: am
e85f05be: Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
* commit '
a0404bf3b76836605d1b489dd75726c0909d96f9':
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
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:41:54 +0000 (19:41 -0700)]
am
6b524cf5: am
3ceecfa3: Check the well-formedness of an xml file before copying.
* commit '
6b524cf591f83d2f733c2ecafb9b987e8872a97e':
Check the well-formedness of an xml file before copying.
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
Jean-Baptiste Queru [Mon, 14 May 2012 15:37:35 +0000 (08:37 -0700)]
am
44fd5580: am
7eb749d1: am
2d7274de: Merge "MIPS generic target support"
* commit '
44fd5580b5f09f7acc1b7446bdb6343ce89b3d52':
MIPS generic target support
Victoria Lease [Mon, 14 May 2012 15:36:22 +0000 (08:36 -0700)]
am
057366e2: am
67095e00: Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev
* commit '
057366e21d6b7b8203bd5b6f6ad32fbb0ba3c15a':
Parse external/cibu-fonts/fonts.mk.
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>
Jean-Baptiste Queru [Mon, 14 May 2012 14:48:34 +0000 (07:48 -0700)]
am
8ff07372: am
0e2bc24e: am
cd99ece7: Merge "x86: customize the malloced address to be 16-byte aligned"
* commit '
8ff07372c100031ec0ab83fef5a58a3903c1dc51':
x86: customize the malloced address to be 16-byte aligned
Doug Zongker [Mon, 14 May 2012 14:26:15 +0000 (07:26 -0700)]
am
31ee627e: am
7bb04231: add copy of public cert used for signing to OTA packages
* commit '
31ee627e729a8b7bb1b60cf73d724231e06be3d7':
add copy of public cert used for signing to OTA packages
Jean-Baptiste Queru [Mon, 14 May 2012 14:26:07 +0000 (07:26 -0700)]
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
OSDN Git Service
