OSDN Git Service
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
Ying Wang [Fri, 28 Feb 2014 02:33:29 +0000 (02:33 +0000)]
am
8e286fbf: am
cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '
8e286fbfc712ed695008f786592fe83e4a1331a7':
Select src arch for prebuilts.
Ying Wang [Fri, 28 Feb 2014 02:30:20 +0000 (18:30 -0800)]
am
cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '
cf1b7d4b2879f856c831587b52f17063da6af158':
Select src arch for prebuilts.
Ying Wang [Fri, 28 Feb 2014 02:27:27 +0000 (02:27 +0000)]
Merge "Select src arch for prebuilts."
Ying Wang [Thu, 27 Feb 2014 22:10:53 +0000 (14:10 -0800)]
Select src arch for prebuilts.
Change-Id: I2d08f923d28d59cfef93ff0bd9893352baaee60b
JP Abgrall [Thu, 27 Feb 2014 18:09:15 +0000 (18:09 +0000)]
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
JP Abgrall [Thu, 27 Feb 2014 18:07:00 +0000 (10:07 -0800)]
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
JP Abgrall [Thu, 27 Feb 2014 18:04:35 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
Ying Wang [Thu, 27 Feb 2014 17:24:45 +0000 (17:24 +0000)]
am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
a90e346c24d498af57360bd92ff738a1480f0598':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:22:03 +0000 (09:22 -0800)]
am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
cd07521f464985373fc4fe13812b5f465373bda5':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:19:33 +0000 (17:19 +0000)]
Merge "Revert "generic_x86: toggle 64bit binder ABI""
Ying Wang [Thu, 27 Feb 2014 17:19:13 +0000 (17:19 +0000)]
Revert "generic_x86: toggle 64bit binder ABI"
This reverts commit
e2525ade32afa72c0e4fe12fc8fab939e41782e6.
Change-Id: Ibaec151084ce4f00194a5a22c4be7531710b4a9f
Mark Salyzyn [Thu, 27 Feb 2014 16:26:54 +0000 (16:26 +0000)]
am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
4c65c202355572f22b3cb48babf0436098807dc7':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:21:08 +0000 (08:21 -0800)]
am
7fc3a06d: Merge "build: add logd"
* commit '
7fc3a06d7fe307332e808712fc8d02c3ed995f80':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:03:57 +0000 (16:03 +0000)]
Merge "build: add logd"
JP Abgrall [Thu, 27 Feb 2014 04:05:14 +0000 (04:05 +0000)]
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
This enables tcpdump for 64bit builds.
This reverts commit
24f99bd4b354789d7368cdee0c924e79e0a1517d.
Change-Id: Ic1413b2f3f66cedbe756d73656c90b3177ba66c0
JP Abgrall [Thu, 27 Feb 2014 02:21:22 +0000 (02:21 +0000)]
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
JP Abgrall [Thu, 27 Feb 2014 02:19:23 +0000 (18:19 -0800)]
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
JP Abgrall [Thu, 27 Feb 2014 02:17:11 +0000 (02:17 +0000)]
Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
Ying Wang [Thu, 27 Feb 2014 01:30:08 +0000 (01:30 +0000)]
am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
66a9b789703b7fac5f57fa318209dc8211f800f7':
Include privileged apps with app zip file.
JP Abgrall [Wed, 26 Feb 2014 22:59:40 +0000 (22:59 +0000)]
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
5c68e265ac2bfeb881f9cc87c50f8b947ddbd86c.
Change-Id: If6a990c72cb3a8d699cf0881f7d5fb8b725fdf2e
Ying Wang [Thu, 27 Feb 2014 01:25:13 +0000 (01:25 +0000)]
Merge "Include privileged apps with app zip file."
Nick Kralevich [Tue, 17 Jan 2012 21:48:32 +0000 (13:48 -0800)]
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
Ying Wang [Wed, 26 Feb 2014 22:31:09 +0000 (22:31 +0000)]
am
9aa715a5: Merge "Remove external/tcpdump from 64-bit build blacklist."
* commit '
9aa715a579765edf0fd4cf2fa0c0146e1b6a7c3b':
Remove external/tcpdump from 64-bit build blacklist.
Nick Kralevich [Wed, 26 Feb 2014 22:31:01 +0000 (22:31 +0000)]
am
9edc9783: Merge "Add policy for MIPS emulator, fix x86 policy."
* commit '
9edc9783d21f59bc532e2b7b62ae2464ee976438':
Add policy for MIPS emulator, fix x86 policy.
Ying Wang [Wed, 26 Feb 2014 22:23:46 +0000 (22:23 +0000)]
Merge "Remove external/tcpdump from 64-bit build blacklist."
Ying Wang [Wed, 26 Feb 2014 22:18:21 +0000 (14:18 -0800)]
Remove external/tcpdump from 64-bit build blacklist.
Change-Id: I40b0c71120a5548072ecb2e552bdbd8c14283097
Nick Kralevich [Wed, 26 Feb 2014 21:37:29 +0000 (21:37 +0000)]
Merge "Add policy for MIPS emulator, fix x86 policy."
Ying Wang [Wed, 26 Feb 2014 20:06:26 +0000 (20:06 +0000)]
am
bbe5f88e: Merge "Conditionally include the \'samplecode\' rules."
* commit '
bbe5f88e1df32d1c998b424eb05ab99cc35c1e8b':
Conditionally include the 'samplecode' rules.
Ying Wang [Wed, 26 Feb 2014 19:58:58 +0000 (19:58 +0000)]
Merge "Conditionally include the 'samplecode' rules."
Ying Wang [Wed, 26 Feb 2014 19:55:38 +0000 (11:55 -0800)]
Conditionally include the 'samplecode' rules.
Not sure goal 'samplecode' is still used by anybody these days.
Change-Id: I808a021a6e4be6a97c4b5c256b94374c1b3dae47
Robert Craig [Wed, 26 Feb 2014 16:48:20 +0000 (11:48 -0500)]
Include privileged apps with app zip file.
Include apps that appear under /system/priv-app
to also be included with the zip of all the apps.
Change-Id: If4687cf4c471877f11d78b68bad96f1842e49d87
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Stephen Smalley [Wed, 26 Feb 2014 13:49:39 +0000 (08:49 -0500)]
Add policy for MIPS emulator, fix x86 policy.
The qemud and /dev/qemu_pipe policy bits copied to generic
and generic_x86 by I620d4aef84a5d4565abb1695db54ce1653612bce
are required for generic_mips as well. In testing, we
further saw other denials for generic_mips that correspond
exactly to what is already allowed in the generic sepolicy, so
just inherit the sepolicy files from generic for now.
We could do likewise for the generic_x86 sepolicy for the files that are
identical with generic if desired, but that is not done by this change.
The generic_x86 sepolicy was missing a rule for /sys/qemu_trace
moved to the generic sepolicy by the prior change, so fix that omission.
The generic*64 variants will need something similar, either by inheriting
from one of the existing sepolicy directories as in the MIPS
case or by forking their own copies as in the x86 case.
Change-Id: Iec7c8825734a3f96f7db8ae1d10dce1f30b22bdf
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Primiano Tucci [Wed, 26 Feb 2014 11:09:19 +0000 (11:09 +0000)]
Add usage comment to explain how to limit modules in mmm.
68895a96 has introduced the possibility to limit the modules being
built by mmm. In many occasions this can save a lot of developement
time since it allows to build one target without processing all the
makefiles in the Android tree. Unfortunatelly this nice feature is
undocumented. This CL adds the one line documentation.
Change-Id: I6ded32c4774047599e9c44e5ea71c07e65731cda
Torne (Richard Coles) [Wed, 26 Feb 2014 11:09:29 +0000 (11:09 +0000)]
am
63002088: Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
* commit '
630020883abc6c8b2c13876e3195ed6abcf4890f':
Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.
Torne (Richard Coles) [Wed, 26 Feb 2014 11:04:03 +0000 (11:04 +0000)]
Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."
Ying Wang [Wed, 26 Feb 2014 02:38:31 +0000 (02:38 +0000)]
am
66331624: Merge "Fix prebuilt library dependency for multilib build"
* commit '
66331624b5422a608607a9924f174ba533573032':
Fix prebuilt library dependency for multilib build
Ying Wang [Wed, 26 Feb 2014 02:33:30 +0000 (02:33 +0000)]
Merge "Fix prebuilt library dependency for multilib build"
Ying Wang [Wed, 26 Feb 2014 02:26:29 +0000 (18:26 -0800)]
Fix prebuilt library dependency for multilib build
Also we don't need to include module_arch_supported.mk again, if we are
currently substituting the source build with LOCAL_PREBUILT_MODULE_FILE.
Change-Id: I444b0397d74c3153b398a050b762e49418062a86
Elliott Hughes [Wed, 26 Feb 2014 02:07:18 +0000 (02:07 +0000)]
am
9dba192b: Merge "oprofile/daemon doesn\'t build for x86_64."
* commit '
9dba192b76ee75c578a62dcef0160fc719a57914':
oprofile/daemon doesn't build for x86_64.
Elliott Hughes [Wed, 26 Feb 2014 02:02:30 +0000 (02:02 +0000)]
Merge "oprofile/daemon doesn't build for x86_64."