OSDN Git Service
Dianne Hackborn [Tue, 18 Mar 2014 12:41:06 +0000 (12:41 +0000)]
am
45b9be37: am
264d4001: (-s ours) am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
45b9be37a5ad7d92fbd8c089386d297412f765f0':
4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 18 Mar 2014 12:37:22 +0000 (12:37 +0000)]
am
264d4001: (-s ours) am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
264d4001e7d01e302f93803d161f778fb200e346':
4.4.3 is MR2, version boogaloo!
Andrew Hsieh [Tue, 18 Mar 2014 00:09:13 +0000 (00:09 +0000)]
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
Andrew Hsieh [Tue, 18 Mar 2014 00:07:44 +0000 (17:07 -0700)]
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
Andrew Hsieh [Tue, 18 Mar 2014 00:04:25 +0000 (00:04 +0000)]
Merge "Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared"
Andrew Hsieh [Tue, 4 Mar 2014 09:11:52 +0000 (17:11 +0800)]
Add LOCAL_NDK_STL_VARIANT:=c++_static and c++_shared
Add llvm libc++ static and shared libraries
Change-Id: I92af9b6ab21cbf8ea82e014a4c11aeb5455920f9
Ying Wang [Sun, 16 Mar 2014 20:08:31 +0000 (20:08 +0000)]
am
a660d06e: am
1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit '
a660d06eeb9a53bc8d88fc2e559d461dc6a77d67':
Don't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 20:04:59 +0000 (13:04 -0700)]
am
1cda15d3: Merge "Don\'t modify LOCAL_STRIP_MODULE"
* commit '
1cda15d3234a502ba7332b56a7bbecca228731cf':
Don't modify LOCAL_STRIP_MODULE
Ying Wang [Sun, 16 Mar 2014 20:02:56 +0000 (20:02 +0000)]
Merge "Don't modify LOCAL_STRIP_MODULE"
Ying Wang [Sun, 16 Mar 2014 19:43:49 +0000 (12:43 -0700)]
Don't modify LOCAL_STRIP_MODULE
LOCAL_STRIP_MODULE will be reused in multilib build.
Change-Id: I3512efb360c7eaafad02859723ab4368778effed
Colin Cross [Sat, 15 Mar 2014 23:59:32 +0000 (23:59 +0000)]
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.
Colin Cross [Sat, 15 Mar 2014 23:56:40 +0000 (16:56 -0700)]
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.
Colin Cross [Sat, 15 Mar 2014 23:54:03 +0000 (23:54 +0000)]
Merge "Work in progress to enable build system support for Clang."
Tim Murray [Fri, 7 Mar 2014 21:18:44 +0000 (13:18 -0800)]
Work in progress to enable build system support for Clang.
Change-Id: I278b48bcd976afcbde8d86261da9b9b9efc9002c
Andrew Hsieh [Fri, 14 Mar 2014 00:26:55 +0000 (00:26 +0000)]
am
de8edc8a: am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
de8edc8a35e5a53c6f1f8e5db099c28691319585':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:23:37 +0000 (17:23 -0700)]
am
933e8940: Merge "Fix HOST_TOOLCHAIN_PREFIX"
* commit '
933e8940d00745413ae1e9d0e76714feecf9086a':
Fix HOST_TOOLCHAIN_PREFIX
Andrew Hsieh [Fri, 14 Mar 2014 00:19:18 +0000 (00:19 +0000)]
Merge "Fix HOST_TOOLCHAIN_PREFIX"
Narayan Kamath [Thu, 13 Mar 2014 09:33:58 +0000 (09:33 +0000)]
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."
Narayan Kamath [Thu, 13 Mar 2014 09:31:33 +0000 (02:31 -0700)]
am
cc8d6dab: Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
* commit '
cc8d6dab9a3ae140ed99d3f3373e72b54811f210':
Revert "Remove external/chromium from the 64 bit blacklist."
Narayan Kamath [Thu, 13 Mar 2014 09:29:52 +0000 (09:29 +0000)]
Merge "Revert "Remove external/chromium from the 64 bit blacklist.""
Narayan Kamath [Thu, 13 Mar 2014 09:29:22 +0000 (09:29 +0000)]
Revert "Remove external/chromium from the 64 bit blacklist."
This reverts commit
27bf51144af3513605cff421beb39a556599eb42.
Change-Id: Ic7e4fff8f87342a248172c2fc0d1358b4db1c25c
Narayan Kamath [Thu, 13 Mar 2014 09:18:00 +0000 (09:18 +0000)]
am
70916972: am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
709169725a34836b3f388526aee714f070f20103':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:08:35 +0000 (02:08 -0700)]
am
25249624: Merge "Remove external/chromium from the 64 bit blacklist."
* commit '
252496247f31ee06d8c948886fd2f3a36ccd021e':
Remove external/chromium from the 64 bit blacklist.
Narayan Kamath [Thu, 13 Mar 2014 09:05:30 +0000 (09:05 +0000)]
Merge "Remove external/chromium from the 64 bit blacklist."
Dmitriy Ivanov [Wed, 12 Mar 2014 18:49:19 +0000 (18:49 +0000)]
am
d842e6d6: am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
d842e6d6c35fc7b0320e2e9ceb69caa71daf040a':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:46:05 +0000 (11:46 -0700)]
am
c62d6f76: Merge "Add TARGET_2ND_ARCH to dumpvar"
* commit '
c62d6f7622f567ba9a0acf54a80d118f85e741b4':
Add TARGET_2ND_ARCH to dumpvar
Dmitriy Ivanov [Wed, 12 Mar 2014 18:40:42 +0000 (18:40 +0000)]
Merge "Add TARGET_2ND_ARCH to dumpvar"
Dmitriy Ivanov [Wed, 12 Mar 2014 18:13:41 +0000 (11:13 -0700)]
Add TARGET_2ND_ARCH to dumpvar
Change-Id: Ida87a61cceb55b7ebc28735b4688a03a10c01096
Narayan Kamath [Wed, 12 Mar 2014 14:42:07 +0000 (14:42 +0000)]
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
Andrew Hsieh [Wed, 12 Mar 2014 11:27:59 +0000 (19:27 +0800)]
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
Dianne Hackborn [Tue, 11 Mar 2014 23:22:38 +0000 (23:22 +0000)]
am
7503e736: 4.4.3 is MR2, version boogaloo!
* commit '
7503e736ebb0161a23ff0ee39a307cd436ea8afc':
4.4.3 is MR2, version boogaloo!
Dianne Hackborn [Tue, 11 Mar 2014 21:54:09 +0000 (14:54 -0700)]
4.4.3 is MR2, version boogaloo!
Change-Id: I1a06850393247183fa3db9fbd3fbc8774f181a26
Ying Wang [Tue, 11 Mar 2014 02:08:45 +0000 (02:08 +0000)]
am
446f00c9: am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
446f00c9e1a8ef2b119617ab63c15a6aa40c733b':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:05:27 +0000 (19:05 -0700)]
am
ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
* commit '
ce156811797d7594b712120c5d969e329d70b1e3':
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Ying Wang [Tue, 11 Mar 2014 02:03:07 +0000 (02:03 +0000)]
Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"
Ying Wang [Tue, 11 Mar 2014 01:23:08 +0000 (18:23 -0700)]
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.
Bug:
13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
Ian Rogers [Tue, 11 Mar 2014 00:01:57 +0000 (00:01 +0000)]
am
21060b30: am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
21060b30993b975084ea7a7c35a6df23cf0e5ea7':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:59:07 +0000 (16:59 -0700)]
am
775d15e0: Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
* commit '
775d15e001d48d72a1b76982b1b5faa1eb37158f':
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Merge "Define __STDC_CONSTANT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:49:41 +0000 (16:49 -0700)]
Define __STDC_CONSTANT_MACROS globally to work around host build differences.
Change-Id: I945128b3087b28f62467c7123b759e3514027574
Ian Rogers [Mon, 10 Mar 2014 23:37:13 +0000 (23:37 +0000)]
am
bc39fd5c: am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
bc39fd5cab47388797ee7638920766e91fe0b100':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:33:44 +0000 (16:33 -0700)]
am
f1e697be: Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
* commit '
f1e697be5e433818071a817af0b673cba8e87795':
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 23:29:25 +0000 (23:29 +0000)]
Merge "Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences.""
Ian Rogers [Mon, 10 Mar 2014 23:27:01 +0000 (23:27 +0000)]
Revert "Define __STDC_LIMIT_MACROS globally to work around host build differences."
This reverts commit
668427c941bd88cacdf24d0562e6b68eb93038a1.
Change-Id: I3694aad84e7499e4c6839db0bd06acf5166e4802
Ian Rogers [Mon, 10 Mar 2014 22:51:08 +0000 (22:51 +0000)]
am
a520bfbe: am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
a520bfbeb65b307da42abb079911311096fef20c':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:48:25 +0000 (15:48 -0700)]
am
4783dc7a: Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
* commit '
4783dc7ab509b7099d2de83f863a9799ce67659e':
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Ian Rogers [Mon, 10 Mar 2014 22:44:49 +0000 (22:44 +0000)]
Merge "Define __STDC_LIMIT_MACROS globally to work around host build differences."
Ian Rogers [Mon, 10 Mar 2014 22:30:39 +0000 (15:30 -0700)]
Define __STDC_LIMIT_MACROS globally to work around host build differences.
Change-Id: I571fc5a4b35c830ca8de4dc3117aef258dffa1bd
Ying Wang [Mon, 10 Mar 2014 19:29:36 +0000 (19:29 +0000)]
am
61cf1df7: am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
61cf1df7edbb9d52a6f151b011633b2859213c35':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:28:03 +0000 (12:28 -0700)]
am
60ef9d5b: Merge "jdk error message should not mention the version"
* commit '
60ef9d5b263bdc6799bb6495bdd34877647d07fe':
jdk error message should not mention the version
Ying Wang [Mon, 10 Mar 2014 19:25:58 +0000 (19:25 +0000)]
Merge "jdk error message should not mention the version"
Chris Wren [Fri, 7 Mar 2014 19:51:56 +0000 (14:51 -0500)]
jdk error message should not mention the version
the version is checked elsewhere
Bug:
13362810
Change-Id: I91e322780d8422ae78b9a4dc8ee008b99f860404
Clay Murphy [Mon, 10 Mar 2014 18:55:24 +0000 (18:55 +0000)]
am
25f47659: am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
25f47659d7cc0e7b9d65ab8ce070fc7b00c4976c':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:52:21 +0000 (11:52 -0700)]
am
05192e5a: Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
* commit '
05192e5a9095ac6a89757157dfd3636a2f56df7f':
Docs: replacing analytics ID from D.A.C. Bug:
11476435
Clay Murphy [Mon, 10 Mar 2014 18:47:17 +0000 (18:47 +0000)]
Merge "Docs: replacing analytics ID from D.A.C. Bug:
11476435"
Adam Hampson [Sat, 8 Mar 2014 01:54:46 +0000 (01:54 +0000)]
am
57afaa53: Add init.environ.rc to installclean
* commit '
57afaa537361e7f5c12c049b13b831c1126b3cad':
Add init.environ.rc to installclean
Adam Hampson [Fri, 7 Mar 2014 23:53:44 +0000 (15:53 -0800)]
Add init.environ.rc to installclean
BOOTCLASSPATH needs to be rebuilt when switching between build
targets.
Bug:
13282187
Change-Id: I16816abb4246878a60e1aa8c91b6b38c7339950e
Signed-off-by: Adam Hampson <ahampson@google.com>
Ben Cheng [Fri, 7 Mar 2014 16:55:52 +0000 (16:55 +0000)]
am
21ef9705: am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
21ef9705b67bc8c2666a30bf71db0ba5125c93f2':
OProfile is no longer compiled now.
Ben Cheng [Fri, 7 Mar 2014 16:52:52 +0000 (08:52 -0800)]
am
f230bcf4: Merge "OProfile is no longer compiled now."
* commit '
f230bcf4035bdbc98e64c769b192c0d33b483913':
OProfile is no longer compiled now.
Ben Cheng [Fri, 7 Mar 2014 16:49:39 +0000 (16:49 +0000)]
Merge "OProfile is no longer compiled now."
Ben Cheng [Wed, 5 Mar 2014 22:31:34 +0000 (14:31 -0800)]
OProfile is no longer compiled now.
BUG:
13249790
Change-Id: I2d4fd8f888823687ea41ddbee1f7ce2a7ebc99f7
Clay Murphy [Wed, 6 Nov 2013 22:03:41 +0000 (14:03 -0800)]
Docs: replacing analytics ID from D.A.C.
Bug:
11476435
Change-Id: I834646e6a618709fe21afa5958bd28f822991e29
Nicolas Geoffray [Wed, 5 Mar 2014 18:04:30 +0000 (18:04 +0000)]
am
db48d145: am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
db48d145841afb9b9b6d1c124191a1681d6b4f39':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 18:02:02 +0000 (10:02 -0800)]
am
247dd0c4: Merge "Do not remove the generated .hpp file from yacc."
* commit '
247dd0c4af33fc7d3ebcfc058837e131e5185546':
Do not remove the generated .hpp file from yacc.
Nicolas Geoffray [Wed, 5 Mar 2014 14:09:26 +0000 (14:09 +0000)]
Merge "Do not remove the generated .hpp file from yacc."
Nicolas Geoffray [Tue, 4 Mar 2014 17:24:44 +0000 (17:24 +0000)]
am
b11697d3: am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
b11697d30778db51d476aedd28b0e2c65eb241e3':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:22:47 +0000 (09:22 -0800)]
am
68d38154: Merge "Remove host-prefix command line argument to dex2oat."
* commit '
68d381540f822849f3bcd7620f773aa9ba004900':
Remove host-prefix command line argument to dex2oat.
Nicolas Geoffray [Tue, 4 Mar 2014 17:20:36 +0000 (17:20 +0000)]
Merge "Remove host-prefix command line argument to dex2oat."
Nicolas Geoffray [Tue, 4 Mar 2014 17:06:40 +0000 (17:06 +0000)]
Remove host-prefix command line argument to dex2oat.
Change-Id: If4a962976d1e8a283d6b682112a1b12d328d8dbb
Nicolas Geoffray [Tue, 4 Mar 2014 14:48:55 +0000 (14:48 +0000)]
Do not remove the generated .hpp file from yacc.
Depending on the file extension of the generated C++ file,
bison will generate a #include of a .h or .hpp. So both files
must be kept in the generated directory.
Change-Id: Id0aac7f407bdc69c7f5012c0d021761b0fceb427
Andrew Hsieh [Tue, 4 Mar 2014 01:12:03 +0000 (01:12 +0000)]
am
12493c89: am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
12493c892e59d826eec41caea6bc90a5778bb672':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:09:18 +0000 (17:09 -0800)]
am
6808c260: Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
* commit '
6808c2608f0eff3275110154d7267f934700c167':
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Andrew Hsieh [Tue, 4 Mar 2014 01:06:04 +0000 (01:06 +0000)]
Merge "Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer"
Victoria Lease [Mon, 3 Mar 2014 23:42:48 +0000 (23:42 +0000)]
am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
4e965ac6f56de2071a381ed37e4a9899062e5ab2':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:40:42 +0000 (15:40 -0800)]
am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
38626e635771a9e1d5ee8f812ea967d842938052':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:38:33 +0000 (23:38 +0000)]
Merge "Add external/google-fonts/*/fonts.mk."
Colin Cross [Mon, 3 Mar 2014 18:32:09 +0000 (10:32 -0800)]
Remove idmap from 64-bit blacklist
frameworks/native/cmds/idmap was accidentally added to the blacklist
in a bad merge in commit
a0eb50accabe83b18bd3fe3b9d6417a4718af9e2.
Change-Id: I545d401a934f1183e03235d5abe5ab15563a4e6d
Nicolas Geoffray [Mon, 3 Mar 2014 18:08:45 +0000 (18:08 +0000)]
am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
d85ef325de805996050170b3ce1cc199cba7c980':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:05:57 +0000 (10:05 -0800)]
am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
460ed38aa977fd9c4318ba8e67e65805cddad6bb':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:03:29 +0000 (18:03 +0000)]
Merge "Extend YACC and LEX handling to .yy and .ll files."
Primiano Tucci [Mon, 3 Mar 2014 17:56:31 +0000 (17:56 +0000)]
am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
ff157c76c9d7d524236e7bfc3ef7cab53dd91818':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:52:47 +0000 (09:52 -0800)]
am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
368faf835b45647bd1961a3a2321daa45ad31568':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:49:06 +0000 (17:49 +0000)]
Merge "Add usage comment to explain how to limit modules in mmm."
Nicolas Geoffray [Mon, 3 Mar 2014 15:57:06 +0000 (15:57 +0000)]
Extend YACC and LEX handling to .yy and .ll files.
The external mclinker project has .yy and .ll files that
require the same rules as .y and .l.
Change-Id: I2b02df9a74bac9c215f8aeb8ee2ff0d2616526ed
Narayan Kamath [Mon, 3 Mar 2014 12:14:41 +0000 (12:14 +0000)]
resolved conflicts for merge of
e8bb5c3a to klp-modular-dev-plus-aosp
Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b
Narayan Kamath [Mon, 3 Mar 2014 11:59:49 +0000 (03:59 -0800)]
am
0d08449c: Merge "Amend 64 bit blacklist."
* commit '
0d08449c0c09c4a24be13b3ac89f4e34369d3b4c':
Amend 64 bit blacklist.
Narayan Kamath [Mon, 3 Mar 2014 11:56:47 +0000 (11:56 +0000)]
Merge "Amend 64 bit blacklist."
Andrew Hsieh [Mon, 3 Mar 2014 08:53:17 +0000 (16:53 +0800)]
Use analyzer at new location: prebuilts/misc/{linux-x86,darwin-x86}/analyzer
Analyzer needed by WITH_STATIC_ANALYZER and WITH_SYNTAX_CHECK is
moved from prebuilts/clang/{linux-x86,darwin-x86}/host/3.3 to
prebuilts/misc/{linux-x86,darwin-x86}/analyzer
See https://android-review.googlesource.com/#/c/83852/
BUG=
13243591
Usage:
"WITH_SYNTAX_CHECK=1 make ..." instructs build system to invoke "clang -fsyntax-only"
to utilize clang's better diagnostics before calling LOCAL_CC/LOCAL_CXX for code generation.
The compilation time is slightly longer, and the generated object file should be the same as
w/o WITH_SYNTAX_CHECK
"WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..." instructs build system to run static
analyzer via "clang --analyze" on a successful build. If analyzer finds any issue, instruction
to open report is displayed. See http://clang-analyzer.llvm.org/scan-build.html for details.
WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist. Project use lots of GCC extensions
(eg. nested function) not supported by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true
Change-Id: Ib3dda3ffb0fd3aaf2eadec867a966d1dd2868fb1
Narayan Kamath [Fri, 28 Feb 2014 15:34:16 +0000 (15:34 +0000)]
Amend 64 bit blacklist.
- external/skia now builds on arm64, frameworks/base/libs/hwui
depends on it.
- external/bluetooth/bluedroid builds on 64 bit, though there
isn't any obvious way to test it without real hardware.
- frameworks/ml now builds, as does external/srec
- frameworks/opt, frameworks/ex and frameworks/wilhelm don't
build because of their dependency on frameworks/av.
frameworks/av should probably be dropped out of the blacklist
and replaced by individual markers on targets that we want
for 64 bit (we don't want all of them for arm64).
Change-Id: I9735108840fcba21ac8918bedf0d6de8989de086
Ying Wang [Sat, 1 Mar 2014 17:34:29 +0000 (17:34 +0000)]
am
a6230641: am
26bcd640: Merge "Try to catch more misuse of ."
* commit '
a623064131f23412daa0ac4b333320e2e30d85f0':
Try to catch more misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 17:27:43 +0000 (09:27 -0800)]
am
26bcd640: Merge "Try to catch more misuse of ."
* commit '
26bcd6404031a491bfd5314d605a7dcc6b64727b':
Try to catch more misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 17:25:26 +0000 (17:25 +0000)]
Merge "Try to catch more misuse of $(my-dir)."
Ying Wang [Sat, 1 Mar 2014 01:16:06 +0000 (17:16 -0800)]
Try to catch more misuse of $(my-dir).
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
Victoria Lease [Fri, 28 Feb 2014 23:30:57 +0000 (15:30 -0800)]
Add external/google-fonts/*/fonts.mk.
Bug:
12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
Ben Cheng [Fri, 28 Feb 2014 19:02:31 +0000 (19:02 +0000)]
am
d86da81f: am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
d86da81fc49bcde9a5328779d13783a744ebadbb':
Make gdbclient smarter for gdb[server] setup.
Ben Cheng [Fri, 28 Feb 2014 18:59:00 +0000 (10:59 -0800)]
am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
2bd77d5ebe55e0b7ac9ae4f84ec76b0c82e317a4':
Make gdbclient smarter for gdb[server] setup.
Ben Cheng [Fri, 28 Feb 2014 18:54:18 +0000 (18:54 +0000)]
Merge "Make gdbclient smarter for gdb[server] setup."
Ben Cheng [Tue, 25 Feb 2014 18:27:07 +0000 (10:27 -0800)]
Make gdbclient smarter for gdb[server] setup.
It can detect and support 3 different scenarios:
- 32-bit exe / 32-bit OS
- 64-bit exe / 64-bit OS
- 32-bit exe / 64-bit OS
Change-Id: I799a91277a5e2331aebf4b2f031e9a79f7ab5bb0
Griff Hazen [Fri, 28 Feb 2014 18:05:36 +0000 (18:05 +0000)]
am
433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '
433febb3c4593e777ef393371b6e99dcce9a7217':
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Griff Hazen [Fri, 28 Feb 2014 16:45:59 +0000 (08:45 -0800)]
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28