Primiano Tucci
29447fa71b
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.
2014-03-03 17:56:31 +00:00
Primiano Tucci
ff157c76c9
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.
2014-03-03 09:52:47 -08:00
Primiano Tucci
368faf835b
Merge "Add usage comment to explain how to limit modules in mmm."
2014-03-03 17:49:06 +00:00
Nicolas Geoffray
9484e2e13f
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
2014-03-03 15:58:46 +00:00
Narayan Kamath
3246d88d6c
resolved conflicts for merge of e8bb5c3a
to klp-modular-dev-plus-aosp
...
Change-Id: I5cb6aeb5dd250aeba059feb1c70c13ac4745db3b
2014-03-03 12:14:41 +00:00
Narayan Kamath
e8bb5c3a54
am 0d08449c: Merge "Amend 64 bit blacklist."
...
* commit '0d08449c0c09c4a24be13b3ac89f4e34369d3b4c':
Amend 64 bit blacklist.
2014-03-03 03:59:49 -08:00
Narayan Kamath
0d08449c0c
Merge "Amend 64 bit blacklist."
2014-03-03 11:56:47 +00:00
Andrew Hsieh
c4f7fbae02
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
2014-03-03 18:47:02 +08:00
Narayan Kamath
9f274954c8
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
2014-03-03 10:23:38 +00:00
Ying Wang
0c0e9b8153
am a6230641: am 26bcd640: Merge "Try to catch more misuse of ."
...
* commit 'a623064131f23412daa0ac4b333320e2e30d85f0':
Try to catch more misuse of $(my-dir).
2014-03-01 17:34:29 +00:00
Ying Wang
a623064131
am 26bcd640: Merge "Try to catch more misuse of ."
...
* commit '26bcd6404031a491bfd5314d605a7dcc6b64727b':
Try to catch more misuse of $(my-dir).
2014-03-01 09:27:43 -08:00
Ying Wang
26bcd64040
Merge "Try to catch more misuse of $(my-dir)."
2014-03-01 17:25:26 +00:00
Ying Wang
79e8319b2e
Try to catch more misuse of $(my-dir).
...
Change-Id: I0c07d7115c66b30ba1383dfaa133f0cc40a33ad7
2014-02-28 18:23:06 -08:00
Victoria Lease
8da3a02c1f
Add external/google-fonts/*/fonts.mk.
...
Bug: 12384866
Change-Id: I30abb9fb962a59b46be1cb9f12b099ea29850a50
2014-02-28 15:35:07 -08:00
Ben Cheng
cc45c60c51
am d86da81f: am 2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
...
* commit 'd86da81fc49bcde9a5328779d13783a744ebadbb':
Make gdbclient smarter for gdb[server] setup.
2014-02-28 19:02:31 +00:00
Ben Cheng
d86da81fc4
am 2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
...
* commit '2bd77d5ebe55e0b7ac9ae4f84ec76b0c82e317a4':
Make gdbclient smarter for gdb[server] setup.
2014-02-28 10:59:00 -08:00
Ben Cheng
2bd77d5ebe
Merge "Make gdbclient smarter for gdb[server] setup."
2014-02-28 18:54:19 +00:00
Ben Cheng
fba67bf896
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
2014-02-28 10:37:47 -08:00
Griff Hazen
6c23e7b8b4
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.
2014-02-28 18:05:36 +00:00
Griff Hazen
433febb3c4
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
...
Change-Id: Iecea3f3af628d89df65a44293a977b2bce35bf28
2014-02-28 08:45:59 -08:00
Ying Wang
cefca29a4c
am 8e286fbf: am cf1b7d4b: Merge "Select src arch for prebuilts."
...
* commit '8e286fbfc712ed695008f786592fe83e4a1331a7':
Select src arch for prebuilts.
2014-02-28 02:33:29 +00:00
Ying Wang
8e286fbfc7
am cf1b7d4b: Merge "Select src arch for prebuilts."
...
* commit 'cf1b7d4b2879f856c831587b52f17063da6af158':
Select src arch for prebuilts.
2014-02-27 18:30:20 -08:00
Ying Wang
cf1b7d4b28
Merge "Select src arch for prebuilts."
2014-02-28 02:27:28 +00:00
Ying Wang
6c930fc1c9
Select src arch for prebuilts.
...
Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
2014-02-27 18:25:29 -08:00
JP Abgrall
65f05c6327
am a0bea538: (-s ours) am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
...
* commit 'a0bea538ae0511a24202d6b952b7e7bb8a606ac8':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
2014-02-27 18:09:15 +00:00
JP Abgrall
a0bea538ae
am 031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
...
* commit '031bff45d051b0cdfcfdca4e35a3ab213e105fce':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
2014-02-27 10:07:00 -08:00
JP Abgrall
031bff45d0
Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
2014-02-27 18:04:35 +00:00
Ying Wang
529a772eec
am a90e346c: am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
...
* commit 'a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 17:24:45 +00:00
Ying Wang
a90e346c24
am cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
...
* commit 'cd07521f464985373fc4fe13812b5f465373bda5':
Revert "generic_x86: toggle 64bit binder ABI"
2014-02-27 09:22:03 -08:00
Ying Wang
cd07521f46
Merge "Revert "generic_x86: toggle 64bit binder ABI""
2014-02-27 17:19:34 +00:00
Ying Wang
32d35a71ff
Revert "generic_x86: toggle 64bit binder ABI"
...
This reverts commit e2525ade32
.
Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
2014-02-27 17:19:13 +00:00
Mark Salyzyn
b8424c7925
am 4c65c202: am 7fc3a06d: Merge "build: add logd"
...
* commit '4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
2014-02-27 16:26:54 +00:00
Mark Salyzyn
4c65c20235
am 7fc3a06d: Merge "build: add logd"
...
* commit '7fc3a06d7fe307332e808712fc8d02c3ed995f80':
build: add logd
2014-02-27 08:21:08 -08:00
Mark Salyzyn
7fc3a06d7f
Merge "build: add logd"
2014-02-27 16:03:58 +00:00
JP Abgrall
352bbe5c9c
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
...
This enables tcpdump for 64bit builds.
This reverts commit 24f99bd4b3
.
Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
2014-02-27 04:05:14 +00:00
JP Abgrall
8c49ad68b0
am 24bbd72d: (-s ours) am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
...
* commit '24bbd72d694083c0cb51fdf719ba079080f31b62':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
2014-02-27 02:21:22 +00:00
JP Abgrall
24bbd72d69
am 5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
...
* commit '5d0dd222cef421d5f5bbde0bed3d898e9ca505f1':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
2014-02-26 18:19:23 -08:00
JP Abgrall
5d0dd222ce
Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
2014-02-27 02:17:11 +00:00
Ying Wang
b3f2893f79
am 66a9b789: Merge "Include privileged apps with app zip file."
...
* commit '66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
2014-02-27 01:30:08 +00:00
JP Abgrall
24f99bd4b3
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
...
This is until aosp gets the latest libpcap+tcpdump currently only on internal.
This reverts commit 5c68e265ac
.
Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
2014-02-27 01:28:11 +00:00
Ying Wang
66a9b78970
Merge "Include privileged apps with app zip file."
2014-02-27 01:25:13 +00:00
Nick Kralevich
1884833c3a
build: add logd
...
Original-Change-Id: I1b96d7e6dd823a83b07b312bf07792482e883789
Signed-off-by: Nick Kralevich <nnk@google.com>
* merge conflicts
* rename syslog to logd to avert confusion with bionic syslog
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I137fb639a80dd28d2f0042b3ae9b7d6eb5eb5bc4
2014-02-26 15:39:38 -08:00
Ying Wang
45bde7bfad
am 9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
...
* commit '9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
2014-02-26 22:31:09 +00:00
Nick Kralevich
65f26a769a
am 9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
...
* commit '9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
2014-02-26 22:31:01 +00:00
Ying Wang
9aa715a579
Merge "Remove external/tcpdump from 64-bit build blacklist."
2014-02-26 22:23:46 +00:00
Ying Wang
5c68e265ac
Remove external/tcpdump from 64-bit build blacklist.
...
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
2014-02-26 14:18:21 -08:00
Nick Kralevich
9edc9783d2
Merge "Add policy for MIPS emulator, fix x86 policy."
2014-02-26 21:37:29 +00:00
Ying Wang
a8d273d3ce
am bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
...
* commit 'bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
2014-02-26 20:06:26 +00:00
Ying Wang
bbe5f88e1d
Merge "Conditionally include the 'samplecode' rules."
2014-02-26 19:58:59 +00:00
Ying Wang
48fbc42f93
Conditionally include the 'samplecode' rules.
...
Not sure goal 'samplecode' is still used by anybody these days.
Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
2014-02-26 11:55:38 -08:00