Andrew Hsieh
0fc900754d
am 6dfe3e11
: Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
...
* commit '6dfe3e11a56707ce288a4dec8d3022ff61ef023f':
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
2012-05-21 18:53:49 -07:00
Andrew Hsieh
6dfe3e11a5
Merge "Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86" into jb-dev-plus-aosp
2012-05-21 18:51:52 -07:00
Jean-Baptiste Queru
fed04c4c72
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
2012-05-21 14:30:47 -07:00
The Android Open Source Project
1ef0a5d637
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
2012-05-21 14:28:03 -07:00
Andrew Hsieh
8e376fb633
am 112a6747
: Add -mno-movbe to disable "movbe" instruction from code-gen
...
* commit '112a674798c58052ddce94418e34f3e5a084ed1a':
Add -mno-movbe to disable "movbe" instruction from code-gen
2012-05-21 12:44:38 -07:00
Jean-Baptiste Queru
99e1613fd5
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
2012-05-21 08:10:26 -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
Andrew Hsieh
b968c85edf
Set generic_x86/BoardConfig.mk TARGET_ARCH_VARIANT to x86
...
Change TARGET_ARCH_VARIANT from x86-atom to x86, for the reason
that atom-specific instruciton like "movbe" isn't "generic" to
x86 Android devices and x86 host running emulator-x86, which may
crash non-atom host in VT because "movbe" isn't supported natively.
Also revert previous fix in TARGET_linux-x86.mk which conservatively
disable "movbe" across the board
Change-Id: Ief93a3585566ffae558fcdc29741e6213a048d7d
2012-05-21 14:27:59 +08:00
The Android Open Source Project
d172e30aed
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ic5f9f074942c800ffb75e0c36212a8143a5b06f6
2012-05-18 18:41:56 -07:00
The Android Automerger
f7eace6497
JRN47D
2012-05-18 15:21:39 -07:00
The Android Automerger
06fc824263
JRN48
2012-05-18 14:55:08 -07:00
The Android Automerger
d0fbbd3446
JFN47C take 3
2012-05-18 12:32:30 -07:00
The Android Automerger
3000844e84
JFN47C
2012-05-18 12:31:42 -07:00
The Android Automerger
43d0d65698
JFN47C take 2
2012-05-18 12:16:59 -07:00
The Android Automerger
7bd7c9b11e
JFN47C
2012-05-18 11:37:02 -07:00
The Android Automerger
137f01598b
JFN48
2012-05-18 10:54:03 -07:00
The Android Automerger
559ba0ad18
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:45:30 -07:00
Andrew Hsieh
112a674798
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
2012-05-18 15:53:35 +08:00
Nick Sanders
8b1b764812
am 3ccf7686
: Move build.prop in factory bundle
...
* commit '3ccf7686757824e5e01944a369fc54baf76f95a4':
Move build.prop in factory bundle
2012-05-17 23:53:01 -07:00
Nick Sanders
3ccf768675
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>
2012-05-17 22:52:17 -07:00
Joe Onorato
b30517897f
Merge commit '54973dbc' into work
...
Conflicts:
core/product.mk
Change-Id: Ib5eb6be09b34bdc04602e2a35a4bf7df0ba82aad
2012-05-17 22:15:22 -07:00
Joe Onorato
9136290afa
Merge commit 'bf2e8a66' into work
...
Change-Id: I5cd704eb59218b56b48d689afdff84638deeacf1
2012-05-17 22:10:24 -07:00
Joe Onorato
54973dbc02
Merge "Add rules to build the factory bundle." into ics-aah
2012-05-17 21:34:53 -07:00
Joe Onorato
bf2e8a66a9
Merge "Add copy-many-files macro." into ics-aah
2012-05-17 20:58:57 -07:00
Joe Onorato
e1d191ee95
Add rules to build the factory bundle.
...
Change-Id: I66bda914a5bd41bda7c8a4314f658924087e2bfb
2012-05-17 20:57:35 -07:00
Joe Onorato
e44705a86f
Add copy-many-files macro.
...
Change-Id: I327fc19bdf9c1ada18b3ba695fe4104e2a241156
2012-05-17 20:57:35 -07:00
The Android Automerger
783908cbae
JRN47C
2012-05-17 15:51:47 -07:00
Jean-Baptiste Queru
dacf9bfe16
am feec98b1
: resolved conflicts for merge of 62855a83
to jb-dev-plus-aosp
...
* commit 'feec98b139d2ca0b0164a5e178e75ce88b8f492f':
Use i686-linux-android-4.6 for x86 build
2012-05-17 15:34:07 -07:00
The Android Automerger
159b9d4d26
JRN47B
2012-05-17 15:05:00 -07:00
The Android Automerger
81b2eb3e3e
JRN47
2012-05-17 09:27:59 -07:00
The Android Automerger
0154779948
merge in jb-release history after reset to jb-dev
2012-05-17 09:25:37 -07:00
The Android Automerger
167cbb0d32
force version reset
2012-05-17 09:25:00 -07:00
The Android Automerger
6631b2941b
JRN47
2012-05-17 07:11:04 -07:00
The Android Automerger
3efaeffcf8
merge in jb-release history after reset to jb-dev
2012-05-17 06:59:25 -07:00
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
Ying Wang
3f7246a081
Delete unused variable.
...
Change-Id: I17f0e2c0b911e505c7ddd3c9c9c56e8a38239e17
2012-05-16 10:16:49 -07:00
Nick Kralevich
2c9032cb82
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.
2012-05-16 09:17:30 -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
95a5b862c0
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
...
2012-05-16 08:42:41 -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