OSDN Git Service
Stephen Hines [Tue, 2 Dec 2014 18:52:12 +0000 (18:52 +0000)]
am
4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
* commit '
4bad2d2156bcb589c2d1bb223a074edc39aa428c':
Add more support for GLOBAL_CONLYFLAGS.
Stephen Hines [Tue, 2 Dec 2014 18:35:17 +0000 (18:35 +0000)]
Merge "Add more support for GLOBAL_CONLYFLAGS."
Ying Wang [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am
ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
* commit '
ded6640d970d83cb18ce2585565c11799064f5e0':
Don't set up the prebuilt apk rule twice.
Ying Wang [Tue, 2 Dec 2014 17:31:44 +0000 (17:31 +0000)]
Merge "Don't set up the prebuilt apk rule twice."
Ying Wang [Mon, 1 Dec 2014 23:56:19 +0000 (15:56 -0800)]
Don't set up the prebuilt apk rule twice.
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.
Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
Stephen Hines [Wed, 26 Nov 2014 08:53:46 +0000 (00:53 -0800)]
Add more support for GLOBAL_CONLYFLAGS.
This will be necessary to support -std=gnu99 mode for clang 3.6, which
defaults to C11 mode (unlike prior releases that use C99).
Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
smain@google.com [Mon, 1 Dec 2014 19:33:14 +0000 (19:33 +0000)]
am
bcca18bf: am
43fbdb2a: am
dc8a05ca: am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
bcca18bfd87543ff8e21d9c892b3ac31bd8de82d':
add support for shadowbox videos with start time specified with #t= in video url
Dan Albert [Mon, 1 Dec 2014 18:11:05 +0000 (18:11 +0000)]
am
7dcbc563: Merge "Fix a typo in my_cppflags assignment."
* commit '
7dcbc563f8811259809b754d0c0edc717e1476e6':
Fix a typo in my_cppflags assignment.
Dan Albert [Mon, 1 Dec 2014 17:59:44 +0000 (17:59 +0000)]
Merge "Fix a typo in my_cppflags assignment."
Dan Albert [Fri, 28 Nov 2014 22:00:12 +0000 (14:00 -0800)]
Fix a typo in my_cppflags assignment.
Make strikes once again...
Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
smain@google.com [Thu, 27 Nov 2014 10:19:35 +0000 (10:19 +0000)]
am
43fbdb2a: am
dc8a05ca: am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
43fbdb2acb8e4e673d963630acbc32ab2717139c':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Thu, 27 Nov 2014 10:08:54 +0000 (10:08 +0000)]
am
dc8a05ca: am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
dc8a05ca6922642851f93889f90052765a8a2fb6':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Wed, 26 Nov 2014 18:42:36 +0000 (18:42 +0000)]
am
78860124: am
d020c517: am
39343e30: am
ccb54008: rev css version to clear browser caches
* commit '
788601245a41067f7f300357925ac7f2d92e86b2':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 18:42:35 +0000 (18:42 +0000)]
am
42abb5fc: am
17874347: am
b90e4792: am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
42abb5fc564e2735dff568d1833e23507e485564':
move the next/previous links in design docs up 25px to avoid overlap with long titles
Roozbeh Pournader [Wed, 26 Nov 2014 18:01:06 +0000 (18:01 +0000)]
am
bceaa7f1: am
35e7c067: Add Lohit fonts to the build.
* commit '
bceaa7f1ae1aaa64935077469c72b0c96a1ceed9':
Add Lohit fonts to the build.
smain@google.com [Wed, 26 Nov 2014 11:56:55 +0000 (11:56 +0000)]
am
570c2210: add support for shadowbox videos with start time specified with #t= in video url
* commit '
570c2210b8ea16cc560e6b62ec06f8ad05fae9aa':
add support for shadowbox videos with start time specified with #t= in video url
smain@google.com [Wed, 26 Nov 2014 03:01:40 +0000 (19:01 -0800)]
add support for shadowbox videos with start time specified with #t= in video url
Change-Id: I165620326f44f8e95bb34a2b623e67fc3b7dcc50
smain@google.com [Wed, 26 Nov 2014 01:46:20 +0000 (01:46 +0000)]
am
d020c517: am
39343e30: am
ccb54008: rev css version to clear browser caches
* commit '
d020c51752611b8b647db9dad94519e5514fc66f':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 01:46:18 +0000 (01:46 +0000)]
am
17874347: am
b90e4792: am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
17874347cc72e88bb318057bca01d36a47dfc5e4':
move the next/previous links in design docs up 25px to avoid overlap with long titles
smain@google.com [Wed, 26 Nov 2014 00:59:47 +0000 (00:59 +0000)]
am
39343e30: am
ccb54008: rev css version to clear browser caches
* commit '
39343e30796d4fbf3d6daa5869acdb71a9fb3a87':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 00:59:42 +0000 (00:59 +0000)]
am
b90e4792: am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
b90e4792dea4271395e216a9d37c712572395003':
move the next/previous links in design docs up 25px to avoid overlap with long titles
smain@google.com [Wed, 26 Nov 2014 00:31:57 +0000 (00:31 +0000)]
am
ccb54008: rev css version to clear browser caches
* commit '
ccb540081ca5f1c69bb1b2721cab319b88f9dd94':
rev css version to clear browser caches
smain@google.com [Wed, 26 Nov 2014 00:27:58 +0000 (00:27 +0000)]
am
3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
* commit '
3a9d50e19d9789cffc0d3d398733d909ee2ee618':
move the next/previous links in design docs up 25px to avoid overlap with long titles
Elliott Hughes [Wed, 26 Nov 2014 00:24:58 +0000 (00:24 +0000)]
am
65a36e0f: Merge "Remove HAVE_SYS_UIO_H."
* commit '
65a36e0fa0701cd834242d628d87b02bd0bbe611':
Remove HAVE_SYS_UIO_H.
smain@google.com [Wed, 26 Nov 2014 00:16:20 +0000 (16:16 -0800)]
rev css version to clear browser caches
Change-Id: I46e04a02a0c010777ba01af28044999a1cbe1e10
Elliott Hughes [Wed, 26 Nov 2014 00:15:36 +0000 (00:15 +0000)]
Merge "Remove HAVE_SYS_UIO_H."
Roozbeh Pournader [Tue, 25 Nov 2014 22:33:07 +0000 (22:33 +0000)]
am
35e7c067: Add Lohit fonts to the build.
* commit '
35e7c067b88c4904d6a57b3bff64410ba0a3ecf3':
Add Lohit fonts to the build.
Elliott Hughes [Tue, 25 Nov 2014 21:59:21 +0000 (13:59 -0800)]
Remove HAVE_SYS_UIO_H.
Change-Id: I4f401900285e166486bb426ac02bc69fc5509a3c
smain@google.com [Tue, 25 Nov 2014 21:34:10 +0000 (13:34 -0800)]
move the next/previous links in design docs up 25px to avoid overlap with long titles
Change-Id: I3428e4cf2959d0e171692d12d47e100b46b6733e
Elliott Hughes [Tue, 25 Nov 2014 21:27:48 +0000 (21:27 +0000)]
am
5bb748dc: Merge "Remove unused HAVE_STDBOOL_H."
* commit '
5bb748dc6eaebf1b37a993721393a14dbc8c929d':
Remove unused HAVE_STDBOOL_H.
Elliott Hughes [Tue, 25 Nov 2014 21:15:56 +0000 (21:15 +0000)]
Merge "Remove unused HAVE_STDBOOL_H."
Elliott Hughes [Tue, 25 Nov 2014 20:22:43 +0000 (12:22 -0800)]
Remove unused HAVE_STDBOOL_H.
Change-Id: I0072847719566e9622ec9765673fdeb8be9eb5ef
Dan Albert [Tue, 25 Nov 2014 19:58:41 +0000 (19:58 +0000)]
am
29f8d7d6: Merge "Make gnu++11 the default standard version."
* commit '
29f8d7d68a8dadd9cb2f087caa1f02a5240e8a07':
Make gnu++11 the default standard version.
Elliott Hughes [Tue, 25 Nov 2014 19:58:39 +0000 (19:58 +0000)]
am
99a75fbb: Merge "Kill unused HAVE_WRITEV."
* commit '
99a75fbbb94c5a7226352ae691933cc88d94af20':
Kill unused HAVE_WRITEV.
Nicolas Geoffray [Tue, 25 Nov 2014 19:58:12 +0000 (19:58 +0000)]
am
3379b3a4: Merge "Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk""
* commit '
3379b3a461c1a96485c3a4e2ee76c83d59c49f7a':
Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
Ying Wang [Tue, 25 Nov 2014 19:03:39 +0000 (19:03 +0000)]
am
918ca4fd: Merge "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
* commit '
918ca4fd35ecdd291672f1f96f9ba258d75e2a8d':
Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
Roozbeh Pournader [Tue, 25 Nov 2014 18:52:20 +0000 (10:52 -0800)]
Add Lohit fonts to the build.
This is needed to support the Oriya script on the expanded font
builds, currently done using the Lohit Odia (Oriya) font.
Bug:
17686019
Change-Id: I2914a9f8f8dfc43797af1551acaa8e43f25007ed
Elliott Hughes [Tue, 25 Nov 2014 18:51:51 +0000 (18:51 +0000)]
am
7adbb466: Merge "Remove TARGET_CPU_SMP."
* commit '
7adbb466597a52873605b14950e70f3d2bc0f4c8':
Remove TARGET_CPU_SMP.
Dan Albert [Tue, 25 Nov 2014 18:36:04 +0000 (18:36 +0000)]
Merge "Make gnu++11 the default standard version."
Elliott Hughes [Tue, 25 Nov 2014 18:35:46 +0000 (18:35 +0000)]
Merge "Kill unused HAVE_WRITEV."
Elliott Hughes [Tue, 25 Nov 2014 18:30:55 +0000 (10:30 -0800)]
Kill unused HAVE_WRITEV.
Change-Id: I6e4df2449b27d67f207fc53b19e49b21f9cee611
smain@google.com [Tue, 25 Nov 2014 17:39:05 +0000 (17:39 +0000)]
am
449809f9: am
096d3031: am
39e4cfab: am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
449809f9463310c8610b61b9f950c9eb601bb725':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
Nicolas Geoffray [Tue, 25 Nov 2014 14:22:36 +0000 (14:22 +0000)]
Merge "Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk""
Nicolas Geoffray [Tue, 25 Nov 2014 12:52:26 +0000 (12:52 +0000)]
Revert "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
This breaks our build-art-host and build-art-target. I think we need to rewrite those rules as well.
This reverts commit
29f0a487b05f87cc3a6c9fbb7e7ae885064e27be.
Change-Id: I2e6674e01a2042e9d53e28ecd3e6bdf76fa806a3
Dan Albert [Tue, 9 Sep 2014 02:06:04 +0000 (19:06 -0700)]
Make gnu++11 the default standard version.
There are a _lot_ of users of `typeof` in the tree, and they'll need a
GNU flavored standard. Rather than fixing up all of these
individually, let's just use gnu++11 as the default.
Bug:
18466763
Change-Id: Ia1bd3adaa74fadba259fda3d37653fb8d5cff69a
Ying Wang [Mon, 24 Nov 2014 23:48:44 +0000 (23:48 +0000)]
Merge "Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk"
Ying Wang [Mon, 24 Nov 2014 23:44:39 +0000 (15:44 -0800)]
Use PRIVATE_POST_INSTALL_CMD to simplify executable_prefer_symlink.mk
Change-Id: I4a2827b2cdbb0bf5a8ca960561fbe17cc80cc275
smain@google.com [Mon, 24 Nov 2014 20:00:57 +0000 (20:00 +0000)]
am
096d3031: am
39e4cfab: am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
096d3031e3e4a0ac03c7bad4dfa90d1d41caa8e6':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 19:11:06 +0000 (19:11 +0000)]
am
39e4cfab: am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
39e4cfabed45984b884975d1e6e9b351e93d9d4a':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 19:02:36 +0000 (19:02 +0000)]
am
f75ee21c: add analytics event tracking for shadowbox player and rig the \'notice-developers-video\' style links to also use shadowbox for video playback
* commit '
f75ee21c34c199632815ad763b940ad0fc63f8ea':
add analytics event tracking for shadowbox player and rig the 'notice-developers-video' style links to also use shadowbox for video playback
smain@google.com [Mon, 24 Nov 2014 17:42:59 +0000 (09:42 -0800)]
add analytics event tracking for shadowbox player and
rig the 'notice-developers-video' style links to also use shadowbox for video playback
Change-Id: Ib48a7c5243ad926345ce9ae9bd572d59aea035f4
Elliott Hughes [Mon, 24 Nov 2014 18:07:55 +0000 (18:07 +0000)]
Merge "Remove TARGET_CPU_SMP."
Michael Runge [Mon, 24 Nov 2014 18:06:36 +0000 (18:06 +0000)]
am
f3761585: am
60f56e7d: am
996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '
f37615859e369c774841eafdb225a5f02259e1ee':
Add support for tuning partitions
smain@google.com [Mon, 24 Nov 2014 18:05:18 +0000 (18:05 +0000)]
am
e7b99103: am
cf6ecd9f: am
2a87b781: am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
e7b991039c9d5590abe8e242e46e9afb3f5e0848':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
Serban Constantinescu [Fri, 21 Nov 2014 17:28:33 +0000 (17:28 +0000)]
Remove TARGET_CPU_SMP.
There are no more users of TARGET_CPU_SMP in the current codebase.
Expert users should set "-smp" in DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES
for targets that run on a single-core CPU.
Change-Id: Ib94865f05a92c9a4622540cebc18ded4bdfa6363
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Michael Runge [Mon, 24 Nov 2014 02:40:33 +0000 (02:40 +0000)]
am
60f56e7d: am
996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '
60f56e7d15f8ae73a29585adfde4915a8ffc26bc':
Add support for tuning partitions
Michael Runge [Mon, 24 Nov 2014 02:37:02 +0000 (02:37 +0000)]
am
996d8f48: Merge "Add support for tuning partitions" into lmp-sprout-dev
* commit '
996d8f48a1b3e6e3a63344633546ff294cc67071':
Add support for tuning partitions
Elliott Hughes [Sun, 23 Nov 2014 17:56:05 +0000 (17:56 +0000)]
am
88392fae: Merge "Ensure the base system includes toybox."
* commit '
88392fae52f2b72e5537bb88a073d527edf7c00d':
Ensure the base system includes toybox.
Elliott Hughes [Sun, 23 Nov 2014 17:47:49 +0000 (17:47 +0000)]
Merge "Ensure the base system includes toybox."
Elliott Hughes [Sun, 23 Nov 2014 07:13:40 +0000 (23:13 -0800)]
Ensure the base system includes toybox.
Change-Id: I0eec19328855d67da1c574a88b452f0eeec6adc7
Dan Albert [Sat, 22 Nov 2014 20:57:19 +0000 (20:57 +0000)]
am
0616000d: Merge "Make cgrep check .hpp files as well."
* commit '
0616000d09905ac423dae0ffccdb0ef3fe24f36d':
Make cgrep check .hpp files as well.
Dan Albert [Sat, 22 Nov 2014 20:48:44 +0000 (20:48 +0000)]
Merge "Make cgrep check .hpp files as well."
Dan Albert [Sat, 22 Nov 2014 18:16:01 +0000 (10:16 -0800)]
Make cgrep check .hpp files as well.
Change-Id: Ie8e9ce7270233ac01d7bc80bda5adc28afa158ed
Elliott Hughes [Sat, 22 Nov 2014 08:17:54 +0000 (08:17 +0000)]
am
28a9c770: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '
28a9c77026bac5e93a03f1f6c67192fc0a6e6c0d':
Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 08:06:10 +0000 (08:06 +0000)]
Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 08:01:19 +0000 (08:01 +0000)]
am
9d3ca15f: Merge "Kill LOCAL_SOCKET_NAMESPACE."
* commit '
9d3ca15f1c8789390b8baaa2df28fd11b14a0a9d':
Kill LOCAL_SOCKET_NAMESPACE.
Elliott Hughes [Sat, 22 Nov 2014 07:55:26 +0000 (23:55 -0800)]
Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: Ie596af7460ec33d70d7327e629b38d641ef48ba2
Elliott Hughes [Sat, 22 Nov 2014 07:52:42 +0000 (07:52 +0000)]
Merge "Kill LOCAL_SOCKET_NAMESPACE."
Elliott Hughes [Sat, 22 Nov 2014 06:54:28 +0000 (22:54 -0800)]
Kill LOCAL_SOCKET_NAMESPACE.
Change-Id: I40c63b8e7ae1174ac902b545555ddab65b3fef38
smain@google.com [Sat, 22 Nov 2014 00:35:40 +0000 (00:35 +0000)]
am
cf6ecd9f: am
2a87b781: am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
cf6ecd9f904d70b1cdffefc216fb72d0b291d088':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
smain@google.com [Sat, 22 Nov 2014 00:25:15 +0000 (00:25 +0000)]
am
2a87b781: am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
2a87b7817d1eedf0ffcc112d3dc951392a465a2e':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
Michael Runge [Fri, 21 Nov 2014 23:40:36 +0000 (23:40 +0000)]
Merge "Add support for tuning partitions" into lmp-sprout-dev
smain@google.com [Fri, 21 Nov 2014 21:06:06 +0000 (21:06 +0000)]
am
698fff02: add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
* commit '
698fff028ab6e58c45c7356922beaa7c6a2e9006':
add style and script to play videos in a shadowbox anytime that a link appears in the page with class "video-shadowbox-button" the link must also have the youtube video set in the href with the ?v parameter
smain@google.com [Fri, 21 Nov 2014 04:39:33 +0000 (20:39 -0800)]
add style and script to play videos in a shadowbox
anytime that a link appears in the page with class "video-shadowbox-button"
the link must also have the youtube video set in the href with the ?v parameter
Change-Id: I4af84f003075b8d2c43acd3295ce3955b141cc97
Dirk Dougherty [Fri, 21 Nov 2014 10:46:29 +0000 (10:46 +0000)]
Dirk Dougherty [Fri, 21 Nov 2014 10:42:09 +0000 (10:42 +0000)]
Dirk Dougherty [Fri, 21 Nov 2014 10:37:02 +0000 (10:37 +0000)]
Michael Runge [Fri, 21 Nov 2014 08:46:03 +0000 (00:46 -0800)]
Add support for tuning partitions
Allow a simple mechanism to call tune2fs to modify an existing
partition without reformatting.
Bug:
18430740
Change-Id: I9210355b6bfec74d002d1f40b930330740f379a5
Ying Wang [Fri, 21 Nov 2014 02:41:08 +0000 (02:41 +0000)]
am
51840e4b: Support journal size board config variables. automerge:
e91b83d
automerge:
1a5f137
* commit '
1a5f13701a4070d63b46d48aaae85428b924e561':
Support journal size board config variables.
Dan Albert [Thu, 20 Nov 2014 23:43:34 +0000 (23:43 +0000)]
am
9cef6823: Merge "Revert "Fix the libgcc/libatomic link order.""
* commit '
9cef6823069d181afa2befa8db771761f8db0c27':
Revert "Fix the libgcc/libatomic link order."
Dan Albert [Thu, 20 Nov 2014 23:27:24 +0000 (23:27 +0000)]
Merge "Revert "Fix the libgcc/libatomic link order.""
Dan Albert [Thu, 20 Nov 2014 22:48:50 +0000 (14:48 -0800)]
Revert "Fix the libgcc/libatomic link order."
This caused a lot of failures in the libc++ tests, since linking
libgcc.a before libc++.so means that the wrong unwinder will be used.
This patch is still correct, but I will revert for now while I find a
good way to apply it without breaking unwinding.
This reverts commit
741b36e922a09c47507b61cbfc9cd8bba029f476.
Change-Id: I57e0b89534adf5c1677dbf2f64ac750e74bd5fbf
Elliott Hughes [Thu, 20 Nov 2014 23:00:34 +0000 (23:00 +0000)]
am
37d75513: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '
37d75513abbada67cd830094fbd30023da12ed11':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Elliott Hughes [Thu, 20 Nov 2014 21:03:29 +0000 (21:03 +0000)]
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
Elliott Hughes [Thu, 20 Nov 2014 20:58:26 +0000 (12:58 -0800)]
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: If3ff83c475921d72936a19317e356549d1706fab
Ying Wang [Thu, 20 Nov 2014 20:28:05 +0000 (20:28 +0000)]
am
51840e4b: Support journal size board config variables. automerge:
e91b83d
* commit '
51840e4b2b87c5b7b045ebac412b0b3d1501643e':
Support journal size board config variables.
Ying Wang [Thu, 20 Nov 2014 20:22:33 +0000 (20:22 +0000)]
Support journal size board config variables.
automerge:
e91b83d
* commit '
e91b83d5e607031ab3da4f85cbb11a823aacf9ed':
Support journal size board config variables.
Ying Wang [Thu, 20 Nov 2014 17:27:36 +0000 (17:27 +0000)]
am
79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."
* commit '
79d8f41e1d5490784288e2a0737be334ef50e7f6':
Fix building on modern versions of Xcode and OS X.
Ying Wang [Thu, 20 Nov 2014 17:27:35 +0000 (17:27 +0000)]
am
ea6113f0: Merge "arm: Support qemu-android on generic arm targets"
* commit '
ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96':
arm: Support qemu-android on generic arm targets
Ying Wang [Thu, 20 Nov 2014 17:18:36 +0000 (17:18 +0000)]
Merge "Fix building on modern versions of Xcode and OS X."
Ying Wang [Thu, 20 Nov 2014 17:17:54 +0000 (17:17 +0000)]
Merge "arm: Support qemu-android on generic arm targets"
Yabin Cui [Thu, 20 Nov 2014 05:21:52 +0000 (05:21 +0000)]
am
aecf9022: Merge "kill HAVE_PREAD"
* commit '
aecf90220c094274d3155b02490f7a00ead72f4e':
kill HAVE_PREAD
Yabin Cui [Thu, 20 Nov 2014 05:15:14 +0000 (05:15 +0000)]
Merge "kill HAVE_PREAD"
Yabin Cui [Thu, 20 Nov 2014 04:48:36 +0000 (20:48 -0800)]
kill HAVE_PREAD
Bug:
18397613
Change-Id: I0061f8080709449f13dc76ce61097a2671c799ff
Dirk Dougherty [Thu, 20 Nov 2014 00:03:25 +0000 (00:03 +0000)]
Dirk Dougherty [Wed, 19 Nov 2014 03:34:34 +0000 (19:34 -0800)]
Support langs.
Change-Id: Ia01e4b41f0ebf2c54669428eef143dce5611d0bd
Ying Wang [Wed, 19 Nov 2014 02:03:13 +0000 (18:03 -0800)]
Support journal size board config variables.
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".
BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.
Bug:
18430740
(cherry picked from commit
f3b86357e20a31ef0febe254f1f08706006f57fa)
Change-Id: Icc6c7e1b3be25b8e21b6a737492d944428e4a35a
Christoffer Dall [Mon, 27 Oct 2014 18:53:24 +0000 (19:53 +0100)]
arm: Support qemu-android on generic arm targets
When building a generic arm 32-bit target, we also want to include
support for the ranchu board model for the updated Android emulator
based on recent upstream QEMU.
Since the emulator.mk file is included by both the generic and
generic_arm64 targets and already defines a PRODUCT_COPY_FILES and
PRODUCT_PACKAGES, move duplicate entries from
target/board/generic*/device.mk to target/product/emulator.mk.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
Ying Wang [Wed, 19 Nov 2014 19:28:23 +0000 (19:28 +0000)]
am
6ead56be: am
f3b86357: Support journal size board config variables.
* commit '
6ead56bed56e3927575726bdebf8511e44f6fb47':
Support journal size board config variables.
Ying Wang [Wed, 19 Nov 2014 19:23:41 +0000 (19:23 +0000)]
am
f3b86357: Support journal size board config variables.
* commit '
f3b86357e20a31ef0febe254f1f08706006f57fa':
Support journal size board config variables.