Commit Graph

2598 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Ying Wang
3f7246a081 Delete unused variable.
Change-Id: I17f0e2c0b911e505c7ddd3c9c9c56e8a38239e17
2012-05-16 10:16:49 -07:00
Jean-Baptiste Queru
2436ea8a8c Merge "Use i686-linux-android-4.6 for x86 build" 2012-05-16 06:42:55 -07:00
Ying Wang
b1a4e4e89e Delete the misleading var TARGET_OUT_STATIC_LIBRARIES.
Which can be replaced by TARGET_OUT_INTERMEDIATE_LIBRARIES.

Change-Id: I965ff1ebe70fc3113c19e4896277c876dcedb6a5
2012-05-15 16:12:18 -07:00
Ying Wang
03b96f54a7 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.
2012-05-15 15:22:36 -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
6e371e426f Don't set or reference LOCAL_MODULE_PATH for uninstallable modules.
Change-Id: I98ab2f6c0d49a87aaeeba29fdf676277e4e65592
2012-05-15 14:31:26 -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
Ying Wang
5983d9df11 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.
2012-05-14 19:41:54 -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
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
Dianne Hackborn
5c3873c075 Merge commit '3742983d' into manualmerge 2012-05-10 23:01:41 -07:00
Dianne Hackborn
3742983d3b JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
Ying Wang
ef86ec540b am ffb36ede: am a1ff6290: Now current is also a valid prebuilt SDK.
* commit 'ffb36ede8f3c785173bfcea912b4c385fce40b20':
  Now current is also a valid prebuilt SDK.
2012-05-10 18:14:35 -07:00
Ying Wang
ffb36ede8f am a1ff6290: Now current is also a valid prebuilt SDK.
* commit 'a1ff6290e1e14d48dc42d1eacf804172c5913916':
  Now current is also a valid prebuilt SDK.
2012-05-10 18:11:23 -07:00
Ying Wang
a1ff6290e1 Now current is also a valid prebuilt SDK.
Change-Id: Id05d20f17a4b46e19df88516f50e58f6cdb62c1c
2012-05-10 18:07:33 -07:00
Ying Wang
f8d557fa77 am ba10a379: am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch
* commit 'ba10a3795d813fc61a6b40e111543434a0b5cf5f':
  Support to build against prebuilt current SDK in unbundled branch
2012-05-10 18:01:18 -07:00
Ying Wang
ba10a3795d am 0ec188f1: Support to build against prebuilt current SDK in unbundled branch
* commit '0ec188f1c197709cf61d0de647b5220539b97322':
  Support to build against prebuilt current SDK in unbundled branch
2012-05-10 17:58:46 -07:00
Ying Wang
0ec188f1c1 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
2012-05-10 17:40:49 -07:00
Nick Kralevich
0dc038075c am 9d602a70: am ecb1a565: x86: compile everything with relro / bind_now
* commit '9d602a7005683965814823feda5aabcce5a92201':
  x86: compile everything with relro / bind_now
2012-05-10 09:30:54 -07:00
Nick Kralevich
9d602a7005 am ecb1a565: x86: compile everything with relro / bind_now
* commit 'ecb1a565849b40ab7aa45b7fe71e24e29a059376':
  x86: compile everything with relro / bind_now
2012-05-10 09:24:10 -07:00
Nick Kralevich
ecb1a56584 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 233d460f21.
This change enables it for x86.

Change-Id: Ib90704f2fecffcfdc3587607112804faa0e16385
2012-05-09 14:49:04 -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
Stephen Hines
192ed892d5 am 25ceb29e: am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev
* commit '25ceb29e001e61189590e97442f3f149b5ee3731':
  Add LLVM_AS to tools.
2012-05-09 01:55:08 -07:00
Elliott Hughes
b696e0b86a am b788e87d: am 9264e4a5: The \'localize\' tool is dead.
* commit 'b788e87dab46387953baa046f32b1ae1802261f0':
  The 'localize' tool is dead.
2012-05-09 01:55:06 -07:00
Stephen Hines
25ceb29e00 am b6956bdd: Merge "Add LLVM_AS to tools." into jb-dev
* commit 'b6956bdd19242cde11b2e9c1f3941585706f3cd3':
  Add LLVM_AS to tools.
2012-05-09 01:49:45 -07:00
Elliott Hughes
b788e87dab am 9264e4a5: The \'localize\' tool is dead.
* commit '9264e4a5f63352cd6abc3d81b18be779a33c7b10':
  The 'localize' tool is dead.
2012-05-09 01:45:01 -07:00
Stephen Hines
b6956bdd19 Merge "Add LLVM_AS to tools." into jb-dev 2012-05-08 18:47:43 -07:00
Stephen Hines
7e48e404b1 Add LLVM_AS to tools.
Change-Id: If9b4900e743b9efbf4b12eee4ed5e713ce82db9b
2012-05-08 18:43:48 -07:00
Jean-Baptiste Queru
92fadc6fbf am 269a40d1: am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit '269a40d140753aee1e579f8179b132ffe3415150':
  Use the same compilation flags on OS X 10.8 as 10.7
2012-05-08 11:32:54 -07:00
Nick Kralevich
23e7e5ab0f armelf.xsc: delete unused file.
As of a2758f19cee0a8daf3194d8c88eeb4d078000a08 in bionic/libc,
this file is no longer needed.

Deleted.

Change-Id: Ia01868522560f022d52f5509b386eccb9bf9e4f1
2012-05-08 10:22:00 -07:00
Elliott Hughes
9264e4a5f6 The 'localize' tool is dead.
Change-Id: I75c43ce064664412e45c304c15f363015c0a4697
2012-05-07 17:33:19 -07:00
Jean-Baptiste Queru
269a40d140 am b031afab: am bf3d3287: Merge "Use the same compilation flags on OS X 10.8 as 10.7"
* commit 'b031afab543d8bf9bb236ff4c297f5ced70f8943':
  Use the same compilation flags on OS X 10.8 as 10.7
2012-05-07 13:59:56 -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
Elliott Hughes
ceda927dff am 559ffeb2: am 8e67348b: Merge "Track libnativehelper move for PDK." into jb-dev
* commit '559ffeb2efd1a3713b715fe0590827054a3b1656':
  Track libnativehelper move for PDK.
2012-05-04 16:53:10 -07:00