Keun young Park
ca7d27212e
am dd8fe390: am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
...
* commit 'dd8fe390ae9244398b41d23adfb42dbaa9804599':
add add-to-product-copy-files-if-exists for pdk
2012-05-30 16:16:20 -07:00
Keun young Park
dd8fe390ae
am 36e4e050: Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
...
* commit '36e4e050ff52956fc4afe60c156e81c2016304c4':
add add-to-product-copy-files-if-exists for pdk
2012-05-30 16:13:43 -07:00
Keun young Park
36e4e050ff
Merge "add add-to-product-copy-files-if-exists for pdk" into jb-dev
2012-05-30 16:11:06 -07:00
Keun young Park
c41c5f4e46
add add-to-product-copy-files-if-exists for pdk
...
Change-Id: Ib35006824de81be31652bfff220bbe4e814869ce
2012-05-30 16:03:24 -07:00
Jeff Brown
645020913c
am 0e18fc47: am 01efddb0: Make make make faster.
...
* commit '0e18fc47b6181df7d354860095453475c7ecfca0':
Make make make faster.
2012-05-30 15:05:48 -07:00
Jeff Brown
0e18fc47b6
am 01efddb0: Make make make faster.
...
* commit '01efddb0b8c641a9ebfd955173dd58e015fbe903':
Make make make faster.
2012-05-30 15:02:56 -07:00
Jeff Brown
01efddb0b8
Make make make faster.
...
Optimize common case of uniq-words where the word is not
actually duplicated. Reduces make startup overhead.
Change-Id: I1bee13bbd08a7b01248f4452283a64a724663d02
2012-05-30 13:52:22 -07:00
Keun young Park
979bf12816
am 2e64f64c: am 3e93aeae: add platform.zip from platform-java to dist
...
* commit '2e64f64c9bc1cc8cbf0f59723b78a278dec66b3b':
add platform.zip from platform-java to dist
2012-05-29 18:32:33 -07:00
Keun young Park
2e64f64c9b
am 3e93aeae: add platform.zip from platform-java to dist
...
* commit '3e93aeae10aa70ab64e78fbab0bb8741d0b04d99':
add platform.zip from platform-java to dist
2012-05-29 18:28:00 -07:00
Keun young Park
3e93aeae10
add platform.zip from platform-java to dist
...
Change-Id: I08e110edf70ef5ec313ee02e03803fa152f0aa6a
2012-05-29 18:13:39 -07:00
Ying Wang
1dfdbc95d1
am a9b484ad: am 82eb7082: Fix typo.
...
* commit 'a9b484ad0ee562225282098b701fe3696ad04bec':
Fix typo.
2012-05-29 13:47:00 -07:00
Ying Wang
a9b484ad0e
am 82eb7082: Fix typo.
...
* commit '82eb7082aa9b7239770f1631211a3c18b6daacfe':
Fix typo.
2012-05-29 13:44:13 -07:00
Ying Wang
82eb7082aa
Fix typo.
...
Change-Id: Id4b619e3fff8d801c4662d9cb2719576c370a503
2012-05-29 13:42:18 -07:00
Ying Wang
9d50defb8b
Revert "Use Mac OS X SDK 10.6."
...
This reverts commit 4c1b310b9b
2012-05-25 18:55:52 -07:00
Ying Wang
4c1b310b9b
Use Mac OS X SDK 10.6.
...
Change-Id: Ie36914ab1763c5606111f7501c97ed97517e7187
2012-05-25 15:43:38 -07:00
Keun young Park
ebfe97a558
am f89cd668: am d8de82fb: ignore touch error happening from broken symbolic link
...
* commit 'f89cd6689c6d39303e61dca88d0f84f8c8fea662':
ignore touch error happening from broken symbolic link
2012-05-25 14:07:47 -07:00
Keun young Park
f89cd6689c
am d8de82fb: ignore touch error happening from broken symbolic link
...
* commit 'd8de82fbca4371ccefb41e02ac737e3a153901b3':
ignore touch error happening from broken symbolic link
2012-05-25 14:04:35 -07:00
Keun young Park
d8de82fbca
ignore touch error happening from broken symbolic link
...
- maguro platform.zip contains hdcp.keys symbolic link which is broken except env with the key
- this causes error in the touch
Bug: 6555557
Change-Id: I5f9ff5d57c87c0d3038545eeba3b553445a8493c
2012-05-25 12:22:22 -07:00
Elliott Hughes
f440828fa0
Merge "Compile Mac OS binaries with unwind tables for libcorkscrew."
2012-05-24 15:21:44 -07:00
Keun young Park
97e6da8677
am 2b9a7982: am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev
...
* commit '2b9a7982e1af5be28126d0ed95fa75ff195dc87f':
enable PDK to use platform JAVA API
2012-05-24 12:57:07 -07:00
Keun young Park
2b9a7982e1
am ac440901: Merge "enable PDK to use platform JAVA API" into jb-dev
...
* commit 'ac44090133e4e3a674be831d28d6d8cc661d2472':
enable PDK to use platform JAVA API
2012-05-24 12:54:57 -07:00
Keun young Park
ac44090133
Merge "enable PDK to use platform JAVA API" into jb-dev
2012-05-24 12:53:07 -07:00
Keun young Park
816b9fd4e2
enable PDK to use platform JAVA API
...
- make platform-java will add necessary Java stuffs from out/target/common/
to platform.zip
- make platform works as before: no Java libraries
- normal fusion build will pick up the file, and define TARGET_BUILD_PDK_JAVA
besides TARGET_BUILD_PDK if Java stuffs are included
- For TARGET_BUILD_PDK_JAVA, java.mk does not touch LOCAL_SDK_VERSION, which will lead into
pulling non-SDK Java APIs
Bug: 6482799
Change-Id: I90b1a0b06dc774150711680a6612f2b97b9eab3f
2012-05-24 11:19:31 -07:00
Elliott Hughes
468d6a584f
Compile Mac OS binaries with unwind tables for libcorkscrew.
...
Change-Id: I9755d8d39913830180da2ce32bcdd357309ff792
2012-05-23 17:32:32 -07:00
Ying Wang
13054c3653
am ce21b820: am 9ccacd7a: Set PWD to the absolute path of the top tree.
...
* commit 'ce21b8204d5713fd0d511cc3635719dd4ca0bf75':
Set PWD to the absolute path of the top tree.
2012-05-23 09:30:50 -07:00
Ying Wang
ce21b8204d
am 9ccacd7a: Set PWD to the absolute path of the top tree.
...
* commit '9ccacd7a6f27dbb38c8365b85fb07197d1fdbb29':
Set PWD to the absolute path of the top tree.
2012-05-23 09:28:26 -07:00
Ying Wang
9ccacd7a6f
Set PWD to the absolute path of the top tree.
...
Previously PWD is passed in as a shell environmental variable,
which does not point to top of the source tree if you run mm/mmm.
That in turn breaks mm/mmm if OUT_DIR_COMMON_BASE is set to an absolute
path.
Change-Id: Iac99d5668aee1bbd3cb9897750afc2149bd9f973
2012-05-22 18:29:02 -07:00
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
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