OSDN Git Service
Victoria Lease [Tue, 4 Mar 2014 00:00:39 +0000 (16:00 -0800)]
am
c9b7f3d6: am
3c14d21a: am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
c9b7f3d6a1a2e5325b762d43cb98169047b122e7':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:49:36 +0000 (23:49 +0000)]
am
3c14d21a: am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
3c14d21a2a62398322479e015fecdb43652fb331':
Add external/google-fonts/*/fonts.mk.
Victoria Lease [Mon, 3 Mar 2014 23:47:04 +0000 (23:47 +0000)]
am
14a5be01: am
4e965ac6: am
38626e63: Merge "Add external/google-fonts/*/fonts.mk."
* commit '
14a5be0174e6d6cf00011bb810b033ec4f7094c0':
Add external/google-fonts/*/fonts.mk.
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."
Doug Zongker [Mon, 3 Mar 2014 18:59:48 +0000 (10:59 -0800)]
am
7676dbe0: Merge "add option to specify updater binary, for development"
* commit '
7676dbe03e124bbe830275f73c3fffd93fec6be0':
add option to specify updater binary, for development
Doug Zongker [Mon, 3 Mar 2014 18:56:50 +0000 (18:56 +0000)]
Merge "add option to specify updater binary, for development"
Colin Cross [Mon, 3 Mar 2014 18:54:30 +0000 (10:54 -0800)]
am
886c61d4: am
50c868c0: am
a8654410: Remove idmap from 64-bit blacklist
* commit '
886c61d422786e1de35ddb62b28ffa593253f552':
Remove idmap from 64-bit blacklist
Colin Cross [Mon, 3 Mar 2014 18:51:16 +0000 (18:51 +0000)]
am
50c868c0: am
a8654410: Remove idmap from 64-bit blacklist
* commit '
50c868c0af886bdb6c624aedefd4d758482583e3':
Remove idmap from 64-bit blacklist
Colin Cross [Mon, 3 Mar 2014 18:49:11 +0000 (18:49 +0000)]
am
a8654410: Remove idmap from 64-bit blacklist
* commit '
a86544106f214c4d0461975d32578b09f7652f6b':
Remove idmap from 64-bit blacklist
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
Doug Zongker [Mon, 3 Mar 2014 18:21:27 +0000 (10:21 -0800)]
add option to specify updater binary, for development
Change-Id: I5f239afff70c87fb16ddc4b8abefa7bbcda6040d
Nicolas Geoffray [Mon, 3 Mar 2014 18:20:07 +0000 (10:20 -0800)]
am
b19e62b3: am
77d4e8ed: am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
b19e62b3f6b173e4e95dca5c04c463eea0cde60f':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:15:22 +0000 (18:15 +0000)]
am
77d4e8ed: am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
77d4e8ed4456c0d033d0740881f0843f00893248':
Extend YACC and LEX handling to .yy and .ll files.
Nicolas Geoffray [Mon, 3 Mar 2014 18:11:47 +0000 (18:11 +0000)]
am
2801735a: am
d85ef325: am
460ed38a: Merge "Extend YACC and LEX handling to .yy and .ll files."
* commit '
2801735ab128a7e5497330d33b44a2707465fa4e':
Extend YACC and LEX handling to .yy and .ll files.
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.
Primiano Tucci [Mon, 3 Mar 2014 18:05:27 +0000 (10:05 -0800)]
am
36ac26a0: am
573eb55d: am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
36ac26a014263361c8388219c86c55b4962840ba':
Add usage comment to explain how to limit modules in mmm.
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 18:02:44 +0000 (18:02 +0000)]
am
573eb55d: am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
573eb55db562854d66426706b1e6e34b4d15fb77':
Add usage comment to explain how to limit modules in mmm.
Primiano Tucci [Mon, 3 Mar 2014 17:59:28 +0000 (17:59 +0000)]
am
29447fa7: am
ff157c76: am
368faf83: Merge "Add usage comment to explain how to limit modules in mmm."
* commit '
29447fa71b089de227a6a8241d53f65b91024231':
Add usage comment to explain how to limit modules in mmm.
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 13:22:29 +0000 (05:22 -0800)]
am
0fe8eac2: am
05e89b22: am
3246d88d: resolved conflicts for merge of
e8bb5c3a to klp-modular-dev-plus-aosp
* commit '
0fe8eac25f44159c3d3ebd280dc82abf073eb8ec':
Amend 64 bit blacklist.
Narayan Kamath [Mon, 3 Mar 2014 12:35:22 +0000 (12:35 +0000)]
am
05e89b22: am
3246d88d: resolved conflicts for merge of
e8bb5c3a to klp-modular-dev-plus-aosp
* commit '
05e89b22a0bc1bbed1579c1bc6139b45ef41aa88':
Amend 64 bit blacklist.
Narayan Kamath [Mon, 3 Mar 2014 12:32:11 +0000 (12:32 +0000)]
am
3246d88d: resolved conflicts for merge of
e8bb5c3a to klp-modular-dev-plus-aosp
* commit '
3246d88d6c71cceec967241337f9da33e1b12d02':
Amend 64 bit blacklist.
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."
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 [Mon, 3 Mar 2014 01:45:20 +0000 (17:45 -0800)]
am
3bbfddd2: Revert "Fix build: Revert "Try to catch more misuse of .""
* commit '
3bbfddd2eae96b69be14baeca05726a70062ba6c':
Revert "Fix build: Revert "Try to catch more misuse of $(my-dir).""
Ying Wang [Sat, 1 Mar 2014 23:32:04 +0000 (15:32 -0800)]
Revert "Fix build: Revert "Try to catch more misuse of $(my-dir).""
This reverts commit
4f6e8342ace107faa09f47bef5924882904d0634.
Ed Heyl [Sat, 1 Mar 2014 22:27:54 +0000 (14:27 -0800)]
am
4f6e8342: Fix build: Revert "Try to catch more misuse of ."
* commit '
4f6e8342ace107faa09f47bef5924882904d0634':
Fix build: Revert "Try to catch more misuse of $(my-dir)."
Ed Heyl [Sat, 1 Mar 2014 22:25:08 +0000 (14:25 -0800)]
Fix build: Revert "Try to catch more misuse of $(my-dir)."
This reverts commit
79e8319b2ea622d487a56498d657440f5935e9e9.
Change-Id: I7d4d352da802deea870fbe4f61f7a7023460a405
Ying Wang [Sat, 1 Mar 2014 17:43:34 +0000 (09:43 -0800)]
am
f6f141a8: am
9cf7af63: am
0c0e9b81: am
a6230641: am
26bcd640: Merge "Try to catch more misuse of ."
* commit '
f6f141a873df4068628993b39ecd3e3782d2a780':
Try to catch more misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 17:40:59 +0000 (17:40 +0000)]
am
9cf7af63: am
0c0e9b81: am
a6230641: am
26bcd640: Merge "Try to catch more misuse of ."
* commit '
9cf7af6317e6f792f0c044f786983481210022cc':
Try to catch more misuse of $(my-dir).
Ying Wang [Sat, 1 Mar 2014 17:37:52 +0000 (17:37 +0000)]
am
0c0e9b81: am
a6230641: am
26bcd640: Merge "Try to catch more misuse of ."
* commit '
0c0e9b815332eca3b3626cc9c47759bbf5e48624':
Try to catch more misuse of $(my-dir).
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:12:46 +0000 (11:12 -0800)]
am
8795fdba: am
c42a7a34: am
cc45c60c: am
d86da81f: am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
8795fdba84efd76fc00087860d46283eceb55638':
Make gdbclient smarter for gdb[server] setup.
Ben Cheng [Fri, 28 Feb 2014 19:09:55 +0000 (19:09 +0000)]
am
c42a7a34: am
cc45c60c: am
d86da81f: am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
c42a7a34333b7829c66d76807313171f3b2433f6':
Make gdbclient smarter for gdb[server] setup.
Ben Cheng [Fri, 28 Feb 2014 19:06:06 +0000 (19:06 +0000)]
am
cc45c60c: am
d86da81f: am
2bd77d5e: Merge "Make gdbclient smarter for gdb[server] setup."
* commit '
cc45c60c5133e06cbca343fa69a69835b7da455e':
Make gdbclient smarter for gdb[server] setup.
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:11:43 +0000 (10:11 -0800)]
am
b1f43648: am
d3b40d52: am
6c23e7b8: am
433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '
b1f4364868069ad10de91dbec8698ec40a3512b6':
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Griff Hazen [Fri, 28 Feb 2014 18:10:02 +0000 (18:10 +0000)]
am
d3b40d52: am
6c23e7b8: am
433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '
d3b40d5235d76461bf60f1eac73c132a06b1a30d':
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
Griff Hazen [Fri, 28 Feb 2014 18:07:57 +0000 (18:07 +0000)]
am
6c23e7b8: am
433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
* commit '
6c23e7b8b49d6045aa1abeab96697d44f0f543e9':
Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
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
Derek Sollenberger [Fri, 28 Feb 2014 13:41:50 +0000 (05:41 -0800)]
am
2284a1c0: Merge "Remove global Skia includes and associated shortcuts."
* commit '
2284a1c0588802aa5b52cf6c1b8520a911cf0fac':
Remove global Skia includes and associated shortcuts.
Derek Sollenberger [Fri, 28 Feb 2014 13:40:31 +0000 (13:40 +0000)]
Merge "Remove global Skia includes and associated shortcuts."
Ying Wang [Fri, 28 Feb 2014 02:42:14 +0000 (18:42 -0800)]
am
55204ee7: am
85331c5a: am
cefca29a: am
8e286fbf: am
cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '
55204ee79c45a47ad190034e4cbd49dd696324e5':
Select src arch for prebuilts.
Ying Wang [Fri, 28 Feb 2014 02:39:34 +0000 (02:39 +0000)]
am
85331c5a: am
cefca29a: am
8e286fbf: am
cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '
85331c5a135da74aca193a1f53855cb7b2e37c95':
Select src arch for prebuilts.
Ying Wang [Fri, 28 Feb 2014 02:36:22 +0000 (02:36 +0000)]
am
cefca29a: am
8e286fbf: am
cf1b7d4b: Merge "Select src arch for prebuilts."
* commit '
cefca29a4ccd404a5d32ed4e5f785c678df06bd1':
Select src arch for prebuilts.
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
Ying Wang [Fri, 28 Feb 2014 01:27:15 +0000 (17:27 -0800)]
am
c0adfb76: Select src arch for prebuilts.
* commit '
c0adfb76cdae425b4c03d85de184364edc33338f':
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
Derek Sollenberger [Thu, 27 Feb 2014 19:02:37 +0000 (14:02 -0500)]
Remove global Skia includes and associated shortcuts.
bug:
13225538
Change-Id: I7deff74f5c0cd7b6ad0e120ffbc378c5eb8d75ee
JP Abgrall [Thu, 27 Feb 2014 18:18:59 +0000 (10:18 -0800)]
am
6fd1eea0: am
4086cc6b: (-s ours) am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
6fd1eea001b70db1507f395957426462d42833a2':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:16:10 +0000 (18:16 +0000)]
am
4086cc6b: (-s ours) am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
4086cc6b81eb606a445cd7f7dbf0b3f857cc89fa':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
JP Abgrall [Thu, 27 Feb 2014 18:12:38 +0000 (18:12 +0000)]
am
65f05c63: am
a0bea538: (-s ours) am
031bff45: (-s ours) Merge "DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok"
* commit '
65f05c6327f3e99144a206b4d9b9d28f133a7108':
DO NOT MERGE: Revert the revert now that tcpdump+64bit=ok
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:32:13 +0000 (09:32 -0800)]
am
2fa191d7: am
3fd8a4fe: am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
2fa191d77795e1dfb1985c7b9b08b491b33b1b3a':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:30:05 +0000 (17:30 +0000)]
am
3fd8a4fe: am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
3fd8a4feae8c384ea04ce50452092a0079553f0e':
Revert "generic_x86: toggle 64bit binder ABI"
Ying Wang [Thu, 27 Feb 2014 17:26:41 +0000 (17:26 +0000)]
am
529a772e: am
a90e346c: am
cd07521f: Merge "Revert "generic_x86: toggle 64bit binder ABI""
* commit '
529a772eecc7a2ce1c916286d742f4f3a32e0d98':
Revert "generic_x86: toggle 64bit binder ABI"
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:35:42 +0000 (08:35 -0800)]
Mark Salyzyn [Thu, 27 Feb 2014 16:33:13 +0000 (16:33 +0000)]
am
7348edf7: am
b8424c79: am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
7348edf7e9437639e505761805c2691a2dc04495':
build: add logd
Mark Salyzyn [Thu, 27 Feb 2014 16:29:59 +0000 (16:29 +0000)]
am
b8424c79: am
4c65c202: am
7fc3a06d: Merge "build: add logd"
* commit '
b8424c7925a22b4297807cd8fa16bc5097adcc3e':
build: add logd
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:45:23 +0000 (18:45 -0800)]
am
ff23e760: am
46335a65: (-s ours) am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
ff23e7600aac71894e026a15b0b559af9487d1d8':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:42:31 +0000 (02:42 +0000)]
am
46335a65: (-s ours) am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
46335a658d1276b9a0bb7de1ad8f69ad0e0c37b2':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
JP Abgrall [Thu, 27 Feb 2014 02:25:04 +0000 (02:25 +0000)]
am
8c49ad68: am
24bbd72d: (-s ours) am
5d0dd222: (-s ours) Merge "DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad"
* commit '
8c49ad68b0e35a85ff71dc8d5b6f195e07fb718a':
DO NOT MERGE: Fix aosp 64bit build. tcpdump+64bit=bad
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:39:02 +0000 (17:39 -0800)]
am
70543d37: am
f7d12336: am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
70543d378ed74debdc0fc3c84b3b269ebc713dfa':
Include privileged apps with app zip file.
Ying Wang [Thu, 27 Feb 2014 01:36:03 +0000 (01:36 +0000)]
am
f7d12336: am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
f7d12336f5aacf715636519363651ab9050abf8f':
Include privileged apps with app zip file.
Ying Wang [Thu, 27 Feb 2014 01:31:48 +0000 (01:31 +0000)]
am
b3f2893f: am
66a9b789: Merge "Include privileged apps with app zip file."
* commit '
b3f2893f793085225f506d771d36c9d710bd0306':
Include privileged apps with app zip file.
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
OSDN Git Service
