Ian Pedowitz
3584355bb9
am a0372e20
: Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
...
* commit 'a0372e20a24283002c2d27b372194d88e1983a3f':
Removing VisualizationWallpapers as it does not comply with API 23 rules
2015-08-12 19:51:22 +00:00
Ian Pedowitz
a0372e20a2
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
2015-08-12 19:41:54 +00:00
Mike Dodd
5e1a991973
am 745d11cc
: Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
...
* commit '745d11ccd077060b5d3b0e3e53682e8c1f85dd66':
Revert "Include new AOSP messaging app in base builds."
2015-08-12 18:58:54 +00:00
Mike Dodd
745d11ccd0
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
2015-08-12 18:53:47 +00:00
Mike Dodd
018500efea
Revert "Include new AOSP messaging app in base builds."
...
This reverts commit a8b0905e16
.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
2015-08-12 18:48:45 +00:00
Ian Pedowitz
68c62e78ad
Removing VisualizationWallpapers as it does not comply with API 23 rules
...
Bug: 23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
2015-08-12 11:11:55 -07:00
Mike Dodd
5d5a3e0d90
am 02389bf9
: Merge "Include new AOSP messaging app in base builds." into mnc-dev
...
* commit '02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
2015-08-12 17:35:04 +00:00
Mike Dodd
02389bf940
Merge "Include new AOSP messaging app in base builds." into mnc-dev
2015-08-12 17:01:24 +00:00
Tao Bao
a2191764f3
am 11cf92aa
: am 1dca55fd
: skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
* commit '11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
2015-08-12 07:04:05 +00:00
Tao Bao
11cf92aa37
am 1dca55fd
: skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
* commit '1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
2015-08-12 06:55:21 +00:00
Tao Bao
1dca55fde5
skip the merge of 67e7c661
to lmp-mr1-ub-dev
...
The change (007979ee
) was cherry-picked from mnc-dev back to
lmp-mr1-dev. It doesn't need to flow further.
Change-Id: I0469708f1f3a0863f194a5820c7aeda4d163cbb7
2015-08-11 23:22:37 -07:00
Tao Bao
67e7c66124
am 007979ee
: Add support for clobbered blocks
...
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75
Add support for clobbered blocks
...
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.
Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b
)
2015-08-11 21:02:45 -07:00
Gina Dimino
505186cb7a
am 291232ae
: am 8f301ff1
: Merge "Docs: Rename content-footer-text plus remove whitespace."
...
* commit '291232aea7130c96a87ca52df0eb1e0e742b1826':
Docs: Rename content-footer-text plus remove whitespace.
2015-08-12 03:21:10 +00:00
Gina Dimino
291232aea7
am 8f301ff1
: Merge "Docs: Rename content-footer-text plus remove whitespace."
...
* commit '8f301ff10d037e4305775c55ce9be6fcb93a8134':
Docs: Rename content-footer-text plus remove whitespace.
2015-08-12 03:14:01 +00:00
Gina Dimino
8f301ff10d
Merge "Docs: Rename content-footer-text plus remove whitespace."
2015-08-12 03:05:59 +00:00
Dan Willemsen
8478f7abbd
resolved conflicts for merge of b184ec2a
to mnc-dev-plus-aosp
...
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
2015-08-11 18:31:59 -07:00
Dan Willemsen
33f46daa22
resolved conflicts for merge of c576c08f
to mnc-dev-plus-aosp
...
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
2015-08-11 18:21:43 -07:00
Dan Willemsen
b184ec2a82
am 608aa91d
: Merge "Revert "Use repeatable timestamps""
...
* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
Revert "Use repeatable timestamps"
2015-08-12 01:07:44 +00:00
Dan Willemsen
608aa91db7
Merge "Revert "Use repeatable timestamps""
2015-08-12 01:02:19 +00:00
Dan Willemsen
92026f2d36
Revert "Use repeatable timestamps"
...
OSX `date` doesn't understand -d
This reverts commit 13ba6e00f4
.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
2015-08-12 01:00:19 +00:00
Dan Willemsen
c576c08fd5
am 671b8ff5
: Merge "Use repeatable timestamps"
...
* commit '671b8ff5457472631f805f3230273e5e8121b28a':
Use repeatable timestamps
2015-08-12 00:55:21 +00:00
Dan Willemsen
671b8ff545
Merge "Use repeatable timestamps"
2015-08-12 00:49:26 +00:00
Dan Willemsen
13ba6e00f4
Use repeatable timestamps
...
This moves all of the date references under build/ to using a single
datetime that can be set manually using BUILD_DATETIME.
It also adds an option, OVERRIDE_C_DATE_TIME, that if set to true, will
redefine __DATE__ and __TIME__ for all C/C++ files so that it matches
BUILD_DATETIME.
Bug: 23117013
Change-Id: I880ef103a26bca86bd7bf42d58e62e740a6228c8
2015-08-11 17:08:03 -07:00
Ying Wang
2bf0ba2dcf
am 23cb26c7
: am 20febe3d
: Merge "Don\'t build otapackage on Mac."
...
* commit '23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
Don't build otapackage on Mac.
2015-08-11 23:23:39 +00:00
Ying Wang
23cb26c7bf
am 20febe3d
: Merge "Don\'t build otapackage on Mac."
...
* commit '20febe3d839131e2cde795ae2a36f93c5ac1c378':
Don't build otapackage on Mac.
2015-08-11 23:14:52 +00:00
Ying Wang
20febe3d83
Merge "Don't build otapackage on Mac."
2015-08-11 22:49:25 +00:00
Ian Pedowitz
c3bc0b112c
resolved conflicts for merge of e5a63158
to mnc-dev-plus-aosp
...
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
2015-08-11 15:06:29 -07:00
Ian Pedowitz
e5a631585a
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
2015-08-11 21:54:17 +00:00
Clay Murphy
f8cb77dfd2
am 71a33c4d
: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
...
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:31 +00:00
Clay Murphy
71a33c4d5b
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11
) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
2015-08-11 20:55:24 +00:00
Mike Dodd
a8b0905e16
Include new AOSP messaging app in base builds.
...
b/23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
2015-08-11 13:14:09 -07:00
Ian Pedowitz
4e0d34c7c7
Increasing arm(64)? emulator partition sizes to 1.5GB
...
Bug: 23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
2015-08-11 12:53:39 -07:00
Ian Pedowitz
c08c3507be
am 073f74d9
: Merge "Increasing x86 emulator system partition size" into mnc-dev
...
* commit '073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
2015-08-11 19:18:43 +00:00
Ian Pedowitz
073f74d908
Merge "Increasing x86 emulator system partition size" into mnc-dev
2015-08-11 19:12:28 +00:00
Ying Wang
09c4b68dfd
Don't build otapackage on Mac.
...
Also removed the unneeded variable DISTTOOLS
and the unnecessary dependency of otapackage/updatepackage on DISTTOOLS.
Bug: 23085297
Change-Id: I6b269003a72bb48eda1260c8d9b4bd88974bcde9
2015-08-11 11:45:54 -07:00
Ian Pedowitz
d18917b781
am a18c5028
: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
* commit 'a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
2015-08-11 17:42:15 +00:00
Ian Pedowitz
a18c5028d7
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
...
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
2015-08-11 10:02:15 -07:00
Ian Pedowitz
a1c92301f4
am 38ffb0cf
: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:17:49 +00:00
Ian Pedowitz
38ffb0cf89
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
...
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Ian Pedowitz
5394e8bd12
Increasing x86 emulator system partition size
...
Seems sdk_google_phone_x86 is building larger than 750MB
Bug: 23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
2015-08-11 03:39:34 +00:00
Omari Stephens
a76428792f
Add the ability to display annotations in the generated docs
...
(cherry-picked from commit 87c44d8a11
)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-10 17:48:08 -07:00
Ying Wang
49e20876b6
am a1655645
: am edf7bf8d
: Merge "Allow custom recovery resource dirs."
...
* commit 'a16556450c53c18d49fa55ad2a5f08880f997e04':
Allow custom recovery resource dirs.
2015-08-10 22:28:30 +00:00
Ying Wang
a16556450c
am edf7bf8d
: Merge "Allow custom recovery resource dirs."
...
* commit 'edf7bf8d832fdd2356cb68519b8e717acde94e5b':
Allow custom recovery resource dirs.
2015-08-10 22:23:10 +00:00
Ying Wang
edf7bf8d83
Merge "Allow custom recovery resource dirs."
2015-08-10 22:15:23 +00:00
Dan Albert
92d6efc595
am 96f480c9
: am 4f20869b
: Merge "Bump the default C++ standard up to C++14."
...
* commit '96f480c93a318fc6550ef2c4d13e6e67574bfb96':
Bump the default C++ standard up to C++14.
2015-08-10 20:53:59 +00:00
Dan Albert
96f480c93a
am 4f20869b
: Merge "Bump the default C++ standard up to C++14."
...
* commit '4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
Bump the default C++ standard up to C++14.
2015-08-10 20:48:48 +00:00
Dan Albert
4f20869b1f
Merge "Bump the default C++ standard up to C++14."
2015-08-10 20:40:00 +00:00
Dan Albert
c7d307d873
Bump the default C++ standard up to C++14.
...
This also drops the NDK default back to C++98 (or C++11 for code using
libc++). The platform NDK build should match the normal NDK build.
Bug: http://b/23043421
Change-Id: I3a336767ce271e84f4dfdebdadb3a98e5689def9
2015-08-10 13:37:42 -07:00
Ying Wang
9a17568624
Allow custom recovery resource dirs.
...
Set TARGET_PRIVATE_RES_DIRS in your BoardConfig.mk to specify custom
private recovery resource directories.
With this change you can share the same recovery resource dir for more
than one device; Also you can specify more than one directories.
Change-Id: Ieeb18f5ac11c98b6f08d0ab6fb4e0d9aa72b27e7
2015-08-10 11:33:10 -07:00