OSDN Git Service
Stephen Hines [Sat, 15 Aug 2015 02:18:58 +0000 (02:18 +0000)]
am
5d17a7e2: am
2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '
5d17a7e2adf505fd7a97782f54856c86a237369d':
Add -mfpu=neon-vfpv4 if cpu is krait
Yang Ni [Sat, 15 Aug 2015 02:18:57 +0000 (02:18 +0000)]
am
dcfb0c80: am
36600a6b: Merge "Include target api version in build system for rscpp."
* commit '
dcfb0c8018ec9e81fa79f3251a3d49a4cc90ddf4':
Include target api version in build system for rscpp.
Stephen Hines [Sat, 15 Aug 2015 02:12:46 +0000 (02:12 +0000)]
am
2e08cb6e: Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
* commit '
2e08cb6e1bf90b0950c875132d2bf37b71d03fbb':
Add -mfpu=neon-vfpv4 if cpu is krait
Stephen Hines [Sat, 15 Aug 2015 02:04:55 +0000 (02:04 +0000)]
Merge "Add -mfpu=neon-vfpv4 if cpu is krait"
Yang Ni [Fri, 14 Aug 2015 18:46:18 +0000 (18:46 +0000)]
am
36600a6b: Merge "Include target api version in build system for rscpp."
* commit '
36600a6bf9b3b79327785cd740a909d3920d6519':
Include target api version in build system for rscpp.
Yang Ni [Fri, 14 Aug 2015 18:39:47 +0000 (18:39 +0000)]
Merge "Include target api version in build system for rscpp."
Dan Albert [Fri, 14 Aug 2015 01:10:46 +0000 (01:10 +0000)]
am
5e9f4912: am
578acca4: Merge "Link librt on the host when using sanitizers."
* commit '
5e9f491218721adecfab6ea0178cd1e4c6723a87':
Link librt on the host when using sanitizers.
Dan Albert [Fri, 14 Aug 2015 01:05:03 +0000 (01:05 +0000)]
am
578acca4: Merge "Link librt on the host when using sanitizers."
* commit '
578acca4e27511900eefc2f65be3e88f9127660c':
Link librt on the host when using sanitizers.
Dan Albert [Fri, 14 Aug 2015 00:59:52 +0000 (00:59 +0000)]
Merge "Link librt on the host when using sanitizers."
Dan Albert [Fri, 14 Aug 2015 00:25:10 +0000 (17:25 -0700)]
Link librt on the host when using sanitizers.
The sanitizers now use shared memory.
Change-Id: Ie8fa6690374eda08ee4138b68fd628ebbfa2d0c8
Noah Presler [Fri, 14 Aug 2015 00:04:10 +0000 (17:04 -0700)]
Include target api version in build system for rscpp.
b/
23161320
Change-Id: Ibc23309abed092e7648168fbf4b80891a44929a6
Joe Fernandez [Thu, 13 Aug 2015 23:12:15 +0000 (23:12 +0000)]
am
71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '
71e0a80c2c2fdc26bb014685eebb874aa40f782d':
doc change: Add hero image for m and css for landing pages.
Joe Fernandez [Thu, 13 Aug 2015 23:02:37 +0000 (23:02 +0000)]
Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
Tao Bao [Thu, 13 Aug 2015 22:31:27 +0000 (22:31 +0000)]
am
3a2e91ca: am
8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '
3a2e91cad7ec1309c07e9d96d572c6a0bed52346':
Free the stash after its use in BBOTA v2.
Tao Bao [Thu, 13 Aug 2015 22:26:17 +0000 (22:26 +0000)]
am
8765fca2: Merge "Free the stash after its use in BBOTA v2."
* commit '
8765fca2f6013fe9d82ff00729089c98921bfb52':
Free the stash after its use in BBOTA v2.
Tao Bao [Thu, 13 Aug 2015 22:22:16 +0000 (22:22 +0000)]
Merge "Free the stash after its use in BBOTA v2."
Tao Bao [Thu, 13 Aug 2015 21:44:15 +0000 (14:44 -0700)]
Free the stash after its use in BBOTA v2.
In BBOTA v2, the stash size computation is inaccurate. A stash will be
used only once, so we deduct its size from stashed_blocks right after
its use. However, the stash doesn't actually get freed until being
overwritten by another stash or destroyed at the end of an update. This
leads to OTA failures due to insufficient space on /cache. This CL
changes the BBOTA v2 script to generate an explicit free right after
its use.
Bug:
23119955
Change-Id: Icdd8352bb0ff778945937c870990a888c7a4d38b
Dirk Dougherty [Thu, 13 Aug 2015 19:37:34 +0000 (12:37 -0700)]
doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
Chris Banes [Thu, 13 Aug 2015 17:36:54 +0000 (17:36 +0000)]
am
743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '
743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
Chris Banes [Thu, 13 Aug 2015 17:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
Dan Albert [Thu, 13 Aug 2015 17:02:13 +0000 (17:02 +0000)]
am
2c00d629: am
727b462a: Merge "Never allow -w."
* commit '
2c00d62940e7f88b2168ccf3a29a1d3e84f59bfa':
Never allow -w.
Dan Albert [Thu, 13 Aug 2015 16:52:55 +0000 (16:52 +0000)]
am
727b462a: Merge "Never allow -w."
* commit '
727b462a92635665ce636c63123078a970654480':
Never allow -w.
Dan Albert [Thu, 13 Aug 2015 16:48:18 +0000 (16:48 +0000)]
Merge "Never allow -w."
Mike Dodd [Thu, 13 Aug 2015 15:21:46 +0000 (15:21 +0000)]
am
5bf35d06: Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
* commit '
5bf35d0685ba62ded55cc63f3dd2f23b82cc645d':
Include new AOSP messaging app in base AOSP telephony builds.
Mike Dodd [Thu, 13 Aug 2015 15:16:38 +0000 (15:16 +0000)]
Merge "Include new AOSP messaging app in base AOSP telephony builds." into mnc-dev
Neil Fuller [Thu, 13 Aug 2015 10:51:04 +0000 (10:51 +0000)]
am
5f198440: am
bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '
5f19844067af27906828af7caed8e8b9c09cac4a':
Include the okhttp.jar when compiling against internal classes
Neil Fuller [Thu, 13 Aug 2015 10:46:46 +0000 (10:46 +0000)]
am
bc7680c4: Merge "Include the okhttp.jar when compiling against internal classes"
* commit '
bc7680c4d7a94cfafcc3c925f0fbf134bc1dfcb8':
Include the okhttp.jar when compiling against internal classes
Neil Fuller [Thu, 13 Aug 2015 10:40:39 +0000 (10:40 +0000)]
Merge "Include the okhttp.jar when compiling against internal classes"
Chris Banes [Thu, 13 Aug 2015 08:38:12 +0000 (09:38 +0100)]
Make sure only AppCompat (not it's tests) are in the docs
BUG:
23169683
Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
Dianne Hackborn [Thu, 13 Aug 2015 00:53:51 +0000 (00:53 +0000)]
am
25abc5a3: Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
* commit '
25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
Fix issie #
23116383: Include security patch level in Settings
Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
Nick Kralevich [Thu, 13 Aug 2015 00:00:36 +0000 (00:00 +0000)]
am
c85364c9: am
5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '
c85364c9c91961461a6d81a37c8b30b34b02383b':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Nick Kralevich [Wed, 12 Aug 2015 23:53:50 +0000 (23:53 +0000)]
am
5f79bcdd: Merge changes from topic \'file_contexts.bin\'
* commit '
5f79bcdd070f4069cd60bbe68430ee172575f9e2':
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Nick Kralevich [Wed, 12 Aug 2015 23:46:28 +0000 (23:46 +0000)]
Merge changes from topic 'file_contexts.bin'
* changes:
build: switch over to file_contexts.bin only
Update embedded.mk to support file_contexts.bin
Dianne Hackborn [Wed, 12 Aug 2015 23:11:20 +0000 (16:11 -0700)]
Fix issie #
23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base AOSP telephony builds.
b/
23110861
Change-Id: I31ba32f3341c77ba6eb083a189dffa1a08c6c8d4
Dan Albert [Wed, 12 Aug 2015 21:54:16 +0000 (14:54 -0700)]
Never allow -w.
Apparently -w will disable all warnings on GCC regardless of ordering
(clang will still respect ordering so warnings that are enabled after
-w are still respected). This is insane. Strip -w from the cflags.
Anyone that wants this flag should be turning off the specific
warnings (or just fix them), not disabling all warnings.
Change-Id: I2ba065637dfdc192921da4d9adbdc63b728c166f
Ian Pedowitz [Wed, 12 Aug 2015 19:51:22 +0000 (19:51 +0000)]
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
Ian Pedowitz [Wed, 12 Aug 2015 19:41:54 +0000 (19:41 +0000)]
Merge "Removing VisualizationWallpapers as it does not comply with API 23 rules" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:58:54 +0000 (18:58 +0000)]
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."
Mike Dodd [Wed, 12 Aug 2015 18:53:47 +0000 (18:53 +0000)]
Merge "Revert "Include new AOSP messaging app in base builds."" into mnc-dev
Mike Dodd [Wed, 12 Aug 2015 18:48:45 +0000 (18:48 +0000)]
Revert "Include new AOSP messaging app in base builds."
This reverts commit
a8b0905e165448857ad45d1633c545c53bd53a5e.
Change-Id: Ia8b8eaf6576937907b073ad97593440e114c0b6f
Ian Pedowitz [Wed, 12 Aug 2015 18:11:55 +0000 (11:11 -0700)]
Removing VisualizationWallpapers as it does not comply with API 23 rules
Bug:
23021372
Change-Id: Ib985ac99bd9068c21f8a1c48e77c72426f69ea79
Mike Dodd [Wed, 12 Aug 2015 17:35:04 +0000 (17:35 +0000)]
am
02389bf9: Merge "Include new AOSP messaging app in base builds." into mnc-dev
* commit '
02389bf940f751ffb85c8c2187a7039f0c18dad1':
Include new AOSP messaging app in base builds.
Mike Dodd [Wed, 12 Aug 2015 17:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
Neil Fuller [Tue, 11 Aug 2015 12:48:34 +0000 (13:48 +0100)]
Include the okhttp.jar when compiling against internal classes
If LOCAL_SDK_VERSION is unset we were compiling against
core-libart but not okhttp.
okhttp should be an implementation detail but
android.net.http.HttpResponseCache implements
com.android.okhttp.OkCacheContainer.
The OpenJDK 8 version of of javac now requires all interfaces of
implemented classes be made available at compile time even with
-source 1.7 -target 1.7.
This is not an issue when compiling against the android.jar because
the implementation of HttpResponseCache in the android.jar does not
implement com.android.okhttp.OkCacheContainer.
Bug:
23099154
Change-Id: I3fa1d0f73535b396623fed953cfc71189b797849
Tao Bao [Wed, 12 Aug 2015 07:04:05 +0000 (07:04 +0000)]
am
11cf92aa: am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
11cf92aa37b9f51176a2055b1ff97b6211404103':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:55:21 +0000 (06:55 +0000)]
am
1dca55fd: skip the merge of
67e7c661 to lmp-mr1-ub-dev
* commit '
1dca55fde512f1758690fb563f1ffc9cec5f7271':
Add support for clobbered blocks
Tao Bao [Wed, 12 Aug 2015 06:19:06 +0000 (23:19 -0700)]
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
Tao Bao [Wed, 12 Aug 2015 05:18:37 +0000 (05:18 +0000)]
am
007979ee: Add support for clobbered blocks
* commit '
007979ee7543a396d97b3e9ada21aca44d503597':
Add support for clobbered blocks
Tao Bao [Tue, 12 May 2015 18:42:31 +0000 (11:42 -0700)]
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
ff7778166bd13a90c89fa333591ee2037f587a11)
Gina Dimino [Wed, 12 Aug 2015 03:21:10 +0000 (03:21 +0000)]
am
291232ae: am
8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace."
* commit '
291232aea7130c96a87ca52df0eb1e0e742b1826':
Docs: Rename content-footer-text plus remove whitespace.
Gina Dimino [Wed, 12 Aug 2015 03:14:01 +0000 (03:14 +0000)]
am
8f301ff1: Merge "Docs: Rename content-footer-text plus remove whitespace."
* commit '
8f301ff10d037e4305775c55ce9be6fcb93a8134':
Docs: Rename content-footer-text plus remove whitespace.
Gina Dimino [Wed, 12 Aug 2015 03:05:59 +0000 (03:05 +0000)]
Merge "Docs: Rename content-footer-text plus remove whitespace."
Dan Willemsen [Wed, 12 Aug 2015 01:31:59 +0000 (18:31 -0700)]
resolved conflicts for merge of
b184ec2a to mnc-dev-plus-aosp
Change-Id: I6178127dd19ee553c15343fc0120af9463b7ac4d
Dan Willemsen [Wed, 12 Aug 2015 01:21:43 +0000 (18:21 -0700)]
resolved conflicts for merge of
c576c08f to mnc-dev-plus-aosp
Change-Id: I2d28518ac5a26de7c5df9a2e3a1902e880155101
Dan Willemsen [Wed, 12 Aug 2015 01:07:44 +0000 (01:07 +0000)]
am
608aa91d: Merge "Revert "Use repeatable timestamps""
* commit '
608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
Revert "Use repeatable timestamps"
Dan Willemsen [Wed, 12 Aug 2015 01:02:19 +0000 (01:02 +0000)]
Merge "Revert "Use repeatable timestamps""
Dan Willemsen [Wed, 12 Aug 2015 01:00:19 +0000 (01:00 +0000)]
Revert "Use repeatable timestamps"
OSX `date` doesn't understand -d
This reverts commit
13ba6e00f4c7e04f1038e94ab98e3ed424daa4fa.
Change-Id: I5970032ff02cc07bd3b087e1eeb5f19b1e4194b4
Dan Willemsen [Wed, 12 Aug 2015 00:55:21 +0000 (00:55 +0000)]
am
671b8ff5: Merge "Use repeatable timestamps"
* commit '
671b8ff5457472631f805f3230273e5e8121b28a':
Use repeatable timestamps
Dan Willemsen [Wed, 12 Aug 2015 00:49:26 +0000 (00:49 +0000)]
Merge "Use repeatable timestamps"
Dan Willemsen [Tue, 11 Aug 2015 22:25:12 +0000 (15:25 -0700)]
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
Ying Wang [Tue, 11 Aug 2015 23:23:39 +0000 (23:23 +0000)]
am
23cb26c7: am
20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '
23cb26c7bfa1714db3b31b166be49a0aa46e4a08':
Don't build otapackage on Mac.
Ying Wang [Tue, 11 Aug 2015 23:14:52 +0000 (23:14 +0000)]
am
20febe3d: Merge "Don\'t build otapackage on Mac."
* commit '
20febe3d839131e2cde795ae2a36f93c5ac1c378':
Don't build otapackage on Mac.
Ying Wang [Tue, 11 Aug 2015 22:49:25 +0000 (22:49 +0000)]
Merge "Don't build otapackage on Mac."
Ian Pedowitz [Tue, 11 Aug 2015 22:06:29 +0000 (15:06 -0700)]
resolved conflicts for merge of
e5a63158 to mnc-dev-plus-aosp
Change-Id: Ifcbf55d0f4a158602867c01546f4c0f7e668697f
Ian Pedowitz [Tue, 11 Aug 2015 21:54:17 +0000 (21:54 +0000)]
Merge "Increasing arm(64)? emulator partition sizes to 1.5GB" into mnc-dev
Clay Murphy [Tue, 11 Aug 2015 21:04:31 +0000 (21:04 +0000)]
am
71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '
71a33c4d5b010757423980b90681445ca2bb2be0':
Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Clay Murphy [Tue, 11 Aug 2015 20:55:24 +0000 (20:55 +0000)]
Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86) Bug:
8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
Mike Dodd [Tue, 11 Aug 2015 20:14:09 +0000 (13:14 -0700)]
Include new AOSP messaging app in base builds.
b/
23110861
Change-Id: I365bedc809425c901982f867e671070344d1112b
Ian Pedowitz [Tue, 11 Aug 2015 19:48:46 +0000 (12:48 -0700)]
Increasing arm(64)? emulator partition sizes to 1.5GB
Bug:
23093319
Change-Id: I5e493ef4715cee96ae6ab40d6415f5330075fad6
Ian Pedowitz [Tue, 11 Aug 2015 19:18:43 +0000 (19:18 +0000)]
am
073f74d9: Merge "Increasing x86 emulator system partition size" into mnc-dev
* commit '
073f74d90853b39de32308fa3eeab9aa8998bd69':
Increasing x86 emulator system partition size
Ian Pedowitz [Tue, 11 Aug 2015 19:12:28 +0000 (19:12 +0000)]
Merge "Increasing x86 emulator system partition size" into mnc-dev
Ying Wang [Tue, 11 Aug 2015 18:24:19 +0000 (11:24 -0700)]
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
Ian Pedowitz [Tue, 11 Aug 2015 17:42:15 +0000 (17:42 +0000)]
am
a18c5028: Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
* commit '
a18c5028d77f0323b8b8959982ae7d6b1ec7aded':
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Ian Pedowitz [Tue, 11 Aug 2015 17:02:15 +0000 (10:02 -0700)]
Final SDK, set PLATFORM_PREVIEW_SDK_VERSION to 0
Change-Id: Ic5af01a7017d2ac5b73d677689d15e4a8ad5dc14
Ian Pedowitz [Tue, 11 Aug 2015 16:17:49 +0000 (16:17 +0000)]
am
38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit '
38ffb0cf899d94cb72409519bd25dc94048dd719':
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Ian Pedowitz [Tue, 11 Aug 2015 14:50:04 +0000 (07:50 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
Ian Pedowitz [Tue, 11 Aug 2015 03:18:41 +0000 (20:18 -0700)]
Increasing x86 emulator system partition size
Seems sdk_google_phone_x86 is building larger than 750MB
Bug:
23093319
Change-Id: Ib3ddbbb96a9dcea02eb6da7362ac0142bdfae4de
Omari Stephens [Sat, 6 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Add the ability to display annotations in the generated docs
(cherry-picked from commit
87c44d8a11d6f9e94c90197e7f8adf430c949c86)
Bug:
8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
Ying Wang [Mon, 10 Aug 2015 22:28:30 +0000 (22:28 +0000)]
am
a1655645: am
edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit '
a16556450c53c18d49fa55ad2a5f08880f997e04':
Allow custom recovery resource dirs.
Ying Wang [Mon, 10 Aug 2015 22:23:10 +0000 (22:23 +0000)]
am
edf7bf8d: Merge "Allow custom recovery resource dirs."
* commit '
edf7bf8d832fdd2356cb68519b8e717acde94e5b':
Allow custom recovery resource dirs.
Ying Wang [Mon, 10 Aug 2015 22:15:23 +0000 (22:15 +0000)]
Merge "Allow custom recovery resource dirs."
Dan Albert [Mon, 10 Aug 2015 20:53:59 +0000 (20:53 +0000)]
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.
Dan Albert [Mon, 10 Aug 2015 20:48:48 +0000 (20:48 +0000)]
am
4f20869b: Merge "Bump the default C++ standard up to C++14."
* commit '
4f20869b1faa07ee0f615ee9087b91ef11e2d6e4':
Bump the default C++ standard up to C++14.
Dan Albert [Mon, 10 Aug 2015 20:40:00 +0000 (20:40 +0000)]
Merge "Bump the default C++ standard up to C++14."
Dan Albert [Wed, 29 Jul 2015 22:13:57 +0000 (15:13 -0700)]
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
Ying Wang [Thu, 6 Aug 2015 18:47:47 +0000 (11:47 -0700)]
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
Tao Bao [Sat, 8 Aug 2015 04:40:29 +0000 (04:40 +0000)]
am
0fed6730: am
8af98164: Merge "Change the cache partition size check into warnings."
* commit '
0fed67301d698a30d3f593f6e6ad738f5b28d41e':
Change the cache partition size check into warnings.
Tao Bao [Sat, 8 Aug 2015 04:32:46 +0000 (04:32 +0000)]
am
8af98164: Merge "Change the cache partition size check into warnings."
* commit '
8af98164162e86cd61ccdcfb0f09744c58e02ac8':
Change the cache partition size check into warnings.
Tao Bao [Sat, 8 Aug 2015 04:26:57 +0000 (04:26 +0000)]
Merge "Change the cache partition size check into warnings."
Tao Bao [Sat, 8 Aug 2015 02:49:45 +0000 (19:49 -0700)]
Change the cache partition size check into warnings.
For some old builds, we may not define cache partition size. Change the
exception into a warning to make the script backward compatible.
Change-Id: Ie94c7fbb1a9f3a7db3f16e8d845e493a534aac5b
Tao Bao [Fri, 7 Aug 2015 20:21:04 +0000 (20:21 +0000)]
am
44c8e4db: am
420f95ff: Merge "releasetools: Support packaging for system_root_image."
* commit '
44c8e4db55707bb67e06ccc0db3f42a8c7a9bb1e':
releasetools: Support packaging for system_root_image.
Dan Willemsen [Fri, 7 Aug 2015 20:20:56 +0000 (20:20 +0000)]
am
b8331622: am
46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
* commit '
b8331622962be9d044eedce0aa1dff33ca1c5b16':
build: Load makefiles in the same order with Make 4.0
Tao Bao [Fri, 7 Aug 2015 04:50:47 +0000 (04:50 +0000)]
am
420f95ff: Merge "releasetools: Support packaging for system_root_image."
* commit '
420f95ff5d0ccf9c41683760c1b2731f6be0667e':
releasetools: Support packaging for system_root_image.
Tao Bao [Fri, 7 Aug 2015 04:45:20 +0000 (04:45 +0000)]
Merge "releasetools: Support packaging for system_root_image."
Dan Willemsen [Fri, 7 Aug 2015 00:54:47 +0000 (00:54 +0000)]
am
46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"
* commit '
46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8':
build: Load makefiles in the same order with Make 4.0
Dan Willemsen [Fri, 7 Aug 2015 00:47:51 +0000 (00:47 +0000)]
Merge "build: Load makefiles in the same order with Make 4.0"
Yusuf Ozuysal [Fri, 7 Aug 2015 00:21:19 +0000 (00:21 +0000)]
am
736463f8: Merge "Add support-customtabs to the doc build." into mnc-dev
* commit '
736463f86cbe4a5d6b1b9333ee0eab4f9ebd5a70':
Add support-customtabs to the doc build.
Yusuf Ozuysal [Fri, 7 Aug 2015 00:10:39 +0000 (00:10 +0000)]
Merge "Add support-customtabs to the doc build." into mnc-dev