Ying Wang
e36870862e
am 87a25ea7: am bce52ca5: Merge "Remove arm64 clang build warning"
...
* commit '87a25ea72f41b77898e62ad09e48e0b0de1dc84f':
Remove arm64 clang build warning
2014-03-18 23:07:49 +00:00
Ying Wang
87a25ea72f
am bce52ca5: Merge "Remove arm64 clang build warning"
...
* commit 'bce52ca5fae5d0062e7622d758a3619f2279c666':
Remove arm64 clang build warning
2014-03-18 16:03:24 -07:00
Ying Wang
bce52ca5fa
Merge "Remove arm64 clang build warning"
2014-03-18 22:58:49 +00:00
Ying Wang
ed56902c29
Remove arm64 clang build warning
...
Now we have enabled arm64 clang.
This change remvoed arm64 clang build warning and cleaned the
arm64 unknow c flags.
Change-Id: Ia583a78c6d364e603ff09df423aa34a6e03d0b9b
2014-03-18 15:58:13 -07:00
Glenn Kasten
0c2acdc042
am 023c2865: am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
...
* commit '023c286563ce09b2d42c81a38d4dc17ee011ac9e':
Don't blacklist all of frameworks/av for 64-bit
2014-03-18 21:53:41 +00:00
Glenn Kasten
023c286563
am 97542cc9: Merge "Don\'t blacklist all of frameworks/av for 64-bit"
...
* commit '97542cc9bf4b2e5fad1576fa7262fa531bcf3fe4':
Don't blacklist all of frameworks/av for 64-bit
2014-03-18 14:48:36 -07:00
Glenn Kasten
97542cc9bf
Merge "Don't blacklist all of frameworks/av for 64-bit"
2014-03-18 21:45:12 +00:00
Greg Hackmann
2521d0d23a
am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"
...
* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
HACK: disable emulator on x86_64
2014-03-18 19:28:33 +00:00
Greg Hackmann
5a4183f391
am 267afcde: Merge "HACK: disable emulator on x86_64"
...
* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
HACK: disable emulator on x86_64
2014-03-18 12:25:45 -07:00
Greg Hackmann
267afcdefe
Merge "HACK: disable emulator on x86_64"
2014-03-18 19:21:49 +00:00
Glenn Kasten
488fe8481a
Don't blacklist all of frameworks/av for 64-bit
...
Change-Id: Ic2db99b1b577e3355c50982af5068bce32edf4ba
2014-03-18 12:12:54 -07:00
Ying Wang
5968350855
am 5462f7f9: am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
...
* commit '5462f7f953915bd345a58b17977e79e6405b56d0':
Remove unused LOCAL_ASSET_FILES.
2014-03-18 18:44:32 +00:00
Ying Wang
5462f7f953
am 255ea2bd: Merge "Remove unused LOCAL_ASSET_FILES."
...
* commit '255ea2bdc45673b7d08809f4495f060b00006c6e':
Remove unused LOCAL_ASSET_FILES.
2014-03-18 11:38:25 -07:00
Ying Wang
255ea2bdc4
Merge "Remove unused LOCAL_ASSET_FILES."
2014-03-18 18:32:05 +00:00
Ying Wang
594f2a4261
Remove unused LOCAL_ASSET_FILES.
...
Change-Id: Ie0b2b2e30a158b779016767fb868f3e03b2f828a
2014-03-18 11:31:09 -07:00
Greg Hackmann
4562c5bcb3
HACK: disable emulator on x86_64
...
The build system and qemu disagree about where the x86_64 kernel should
live; disable the emulator until that's resolved
Change-Id: Ia7a2745ee8f3f4211ce39f8d851d5d860acbf62b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-18 11:13:37 -07:00
Scott Main
ce1ea34010
am 7250ac63: am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit '7250ac63e5a3f7d04f055ccb53b5a1f32f4c11e1':
add some css to support android wear sub-site
2014-03-18 12:41:07 +00:00
Dianne Hackborn
8bc7a28330
am 45b9be37: am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
...
* commit '45b9be37a5ad7d92fbd8c089386d297412f765f0':
4.4.3 is MR2, version boogaloo!
2014-03-18 12:41:06 +00:00
Scott Main
7250ac63e5
am bb79f9d2: am b7b49711: add some css to support android wear sub-site
...
* commit 'bb79f9d2a52c7f1e20bd74e5d80b2df4119cec82':
add some css to support android wear sub-site
2014-03-18 12:37:22 +00:00
Dianne Hackborn
45b9be37a5
am 264d4001: (-s ours) am 7503e736: 4.4.3 is MR2, version boogaloo!
...
* commit '264d4001e7d01e302f93803d161f778fb200e346':
4.4.3 is MR2, version boogaloo!
2014-03-18 12:37:22 +00:00
Scott Main
bb79f9d2a5
am b7b49711: add some css to support android wear sub-site
...
* commit 'b7b497115fb19d17a3e5de20646a5eac759c0095':
add some css to support android wear sub-site
2014-03-18 12:35:42 +00:00
Scott Main
b7b497115f
add some css to support android wear sub-site
...
Change-Id: Ibce2c596219fb86f433075c88a0af9d0cc1007b3
2014-03-18 05:32:26 -07:00
Andrew Hsieh
66a4ef8f75
am d14f3cc7: am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
...
* commit 'd14f3cc7bc9983ea5ba1c2d952d2b5f51935f42c':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-18 00:09:13 +00:00
Andrew Hsieh
d14f3cc7bc
am 5384c187: Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
...
* commit '5384c187871b1ede992d7de2b4299be45d0e0030':
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
2014-03-17 17:07:44 -07:00
Andrew Hsieh
5384c18787
Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
2014-03-18 00:04:26 +00:00
Andrew Hsieh
73d800e519
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
...
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
2014-03-17 20:30:45 +08:00
Ying Wang
ce4187832a
am a660d06e: am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
...
* commit 'a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
Don't modify LOCAL_STRIP_MODULE
2014-03-16 20:08:31 +00:00
Ying Wang
a660d06eeb
am 1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
...
* commit '1cda15d3234a502ba7332b56a7bbecca228731cf':
Don't modify LOCAL_STRIP_MODULE
2014-03-16 13:04:59 -07:00
Ying Wang
1cda15d323
Merge "Don't modify LOCAL_STRIP_MODULE"
2014-03-16 20:02:56 +00:00
Ying Wang
e1889af2d5
Don't modify LOCAL_STRIP_MODULE
...
LOCAL_STRIP_MODULE will be reused in multilib build.
Change-Id: I3512efb360c7eaafad02859723ab4368778effed
2014-03-16 12:43:49 -07:00
Colin Cross
8213b719c8
am 6e92ade0: am db24577b: Merge "Work in progress to enable build system support for Clang."
...
* commit '6e92ade0a6cd8aea8f074fdc44f375ef2f1d50b7':
Work in progress to enable build system support for Clang.
2014-03-15 23:59:32 +00:00
Colin Cross
6e92ade0a6
am db24577b: Merge "Work in progress to enable build system support for Clang."
...
* commit 'db24577bbd0ccc60be19791290d367e2efb5583e':
Work in progress to enable build system support for Clang.
2014-03-15 16:56:40 -07:00
Colin Cross
db24577bbd
Merge "Work in progress to enable build system support for Clang."
2014-03-15 23:54:03 +00:00
Tim Murray
b5f333bbef
Work in progress to enable build system support for Clang.
...
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
2014-03-14 00:39:03 -07:00
Andrew Hsieh
228f8afc4d
am de8edc8a: am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
...
* commit 'de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
2014-03-14 00:26:55 +00:00
Andrew Hsieh
de8edc8a35
am 933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
...
* commit '933e8940d00745413ae1e9d0e76714feecf9086a':
Fix HOST_TOOLCHAIN_PREFIX
2014-03-13 17:23:37 -07:00
Andrew Hsieh
933e8940d0
Merge "Fix HOST_TOOLCHAIN_PREFIX"
2014-03-14 00:19:19 +00:00
Narayan Kamath
f262d87f01
am 237f5414: am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit '237f5414ebf38e1386307679947641f72865fc38':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:33:58 +00:00
Narayan Kamath
237f5414eb
am cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
...
* commit 'cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
Revert "Remove external/chromium from the 64 bit blacklist."
2014-03-13 02:31:33 -07:00
Narayan Kamath
cc8d6dab9a
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
2014-03-13 09:29:52 +00:00
Narayan Kamath
c00ab8e012
Revert "Remove external/chromium from the 64 bit blacklist."
...
This reverts commit 27bf51144a
.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
2014-03-13 09:29:22 +00:00
Narayan Kamath
f6869e25c9
am 70916972: am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit '709169725a34836b3f388526aee714f070f20103':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 09:18:00 +00:00
Narayan Kamath
709169725a
am 25249624: Merge "Remove external/chromium from the 64 bit blacklist."
...
* commit '252496247f31ee06d8c948886fd2f3a36ccd021e':
Remove external/chromium from the 64 bit blacklist.
2014-03-13 02:08:35 -07:00
Narayan Kamath
252496247f
Merge "Remove external/chromium from the 64 bit blacklist."
2014-03-13 09:05:32 +00:00
Dmitriy Ivanov
7ba6258a7b
am d842e6d6: am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'd842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 18:49:19 +00:00
Dmitriy Ivanov
d842e6d6c3
am c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
...
* commit 'c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
2014-03-12 11:46:05 -07:00
Dmitriy Ivanov
c62d6f7622
Merge "Add TARGET_2ND_ARCH to dumpvar"
2014-03-12 18:40:43 +00:00
Dmitriy Ivanov
d5cd1e2ecf
Add TARGET_2ND_ARCH to dumpvar
...
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
2014-03-12 11:13:41 -07:00
Narayan Kamath
27bf51144a
Remove external/chromium from the 64 bit blacklist.
...
This isn't the same as chromium_org (which is used by the
webview). This is a 3 year old snapshot of the net stack which
compiles under 64 bit. It's currently used on aosp master by
libstagefright_chromium_http.
This project can be removed if the changes that remove the
chromium dependency are cherry-picked to aosp/master.
Change-Id: I5d0f9ed03ea9842b47d980d77ea32bc7a3f6998f
2014-03-12 14:43:38 +00:00
Andrew Hsieh
cbe162e914
Fix HOST_TOOLCHAIN_PREFIX
...
Previously HOST_TOOLCHAIN_PREFIX can't accept toolchain in arch-os-*-gcc
format. Fix it so we can try out new host toolchain, eg.
HOST_TOOLCHAIN_PREFIX=prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- make
Change-Id: Ic1092593036c41d5471e788654fb4e0991dd7e40
2014-03-12 19:27:59 +08:00