OSDN Git Service
Brian Carlstrom [Sun, 4 Oct 2015 19:40:41 +0000 (19:40 +0000)]
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
Brian Carlstrom [Thu, 1 Oct 2015 03:28:54 +0000 (20:28 -0700)]
Use $OUT_DIR/filelist when OUT_DIR is set
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
Ying Wang [Fri, 12 Jun 2015 17:33:59 +0000 (10:33 -0700)]
Really include drawables for all densities.
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug:
21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
Zach Jang [Mon, 28 Sep 2015 21:17:41 +0000 (21:17 +0000)]
Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
Zach Jang [Tue, 22 Sep 2015 00:42:49 +0000 (17:42 -0700)]
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
Zach Jang [Mon, 21 Sep 2015 23:57:06 +0000 (23:57 +0000)]
am
ef024064: (-s ours) am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
ef02406452c41f90955460179c1f1d900bcedba9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 23:57:04 +0000 (23:57 +0000)]
am
f694d378: (-s ours) resolved conflicts for
b161297d to lmp-mr1-ub-dev
* commit '
f694d378955ddac3ee2651080bfa00c5ae39dddc':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 21:06:10 +0000 (21:06 +0000)]
am
09611509: am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
0961150929c775a439f31b8c4fb35ba6a03c6f08':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 20:00:04 +0000 (13:00 -0700)]
resolved conflicts for
b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
Zach Jang [Mon, 21 Sep 2015 19:05:35 +0000 (19:05 +0000)]
am
63712481: am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
63712481f04b6525288b5df182d6f3e853a3bfb9':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 19:05:33 +0000 (19:05 +0000)]
am
ab095b44: am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
ab095b445af361911df2856e77f43c4cf103a0e2':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:22 +0000 (18:58 +0000)]
am
bb97ff59: am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
bb97ff5941b266639e31fd4a30a6d34921e7bc2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Mon, 21 Sep 2015 18:58:10 +0000 (18:58 +0000)]
am
48e2b43e: am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
48e2b43e8cc030456b0f625f321c45d2e1775130':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:40:28 +0000 (20:40 +0000)]
am
a7168e1c: am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
a7168e1c6ef9e9bc5491b09cb9db683b69e25e2b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:27:20 +0000 (20:27 +0000)]
am
e539537d: (-s ours) am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
e539537d8c7a4288f40afa9226787b9af3d4416b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:16:43 +0000 (20:16 +0000)]
am
7f96f4f6: am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:23 +0000 (20:04 +0000)]
am
4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
4c710cbe7f5786c3df396ea4283da920fd5c351b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Thu, 17 Sep 2015 20:04:17 +0000 (20:04 +0000)]
am
47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '
47ef4c3467e4f895b776fb0e8dbcba8f90a9398c':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Zach Jang [Sat, 12 Sep 2015 00:27:09 +0000 (17:27 -0700)]
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3
b/
23946860
Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
Bo Hu [Wed, 16 Sep 2015 17:38:07 +0000 (17:38 +0000)]
Merge "emulator.mk: Add ethernet permission" into mnc-dev
leozwang [Tue, 15 Sep 2015 15:44:12 +0000 (08:44 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23999213
Change-Id: I6c715eb01048e187622ba1e90c89a3306a294b8a
leozwang [Tue, 15 Sep 2015 07:52:08 +0000 (07:52 +0000)]
leozwang [Tue, 15 Sep 2015 07:41:53 +0000 (00:41 -0700)]
Fix build.
Convert ota_from_target_files back to symbolic link.
Change-Id: I932ba8c0b15fa71a27083adc92e9f9a90dc82f8c
Leo Wang [Tue, 15 Sep 2015 04:43:38 +0000 (04:43 +0000)]
am
1c1a6d15: am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
1c1a6d15b2c979f28d3cf9a13e96e16e24be16ec':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:36:53 +0000 (04:36 +0000)]
am
2c9dfb82: am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
2c9dfb8239bb4cbe1c9118ccc5bd115713f513e6':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:29:45 +0000 (04:29 +0000)]
am
1d4ad515: Revert "Add an option to include a full bootloader in incremental OTA."
* commit '
1d4ad5158b2cf2f30269d8f733548188208af64a':
Revert "Add an option to include a full bootloader in incremental OTA."
Leo Wang [Tue, 15 Sep 2015 04:03:20 +0000 (04:03 +0000)]
Revert "Add an option to include a full bootloader in incremental OTA."
This reverts commit
46d5efcd0d451a48cc793931efef2b1ca982386d.
Change-Id: Ibd347be362db50c0cdb34bf828718872bd74ad56
leozwang [Tue, 15 Sep 2015 01:07:05 +0000 (01:07 +0000)]
am
1753b4e9: resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
* commit '
1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
Add an option to include a full bootloader in incremental OTA.
bohu [Mon, 14 Sep 2015 23:02:43 +0000 (16:02 -0700)]
emulator.mk: Add ethernet permission
Networking on old emulator device(a.k.a. goldfish) relies on RIL;
However, RIL is not available on ranchu device yet. For ranchu device
to have a functional networking, we need to add ethernet permission
and start dhcpcd_eth0 service on ranchu device. This CL adds ethernet
permission to both goldfish (which is harmless) and ranchu devices.
This addition was originally proposed by miroslav.tisma@imgtec.com
and the ethernet permission was only added to arm64 and mips64 after
discussion. With the ranchu device supporting more architectures,
it makes sense to allow this permission on all devices and all CPU
architectures.
related CL by miroslav.tisma@imgtec.com on AOSP:
b09fb84becf73bf2bc578ebf27910d75b79d668a
bug:
24070972
Change-Id: I81ac5d8901adee43784fe9dd45a170fb90bb824a
leozwang [Mon, 14 Sep 2015 23:39:23 +0000 (16:39 -0700)]
resolved conflicts for
00fdede3 to lmp-mr1-ub-dev
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
leozwang [Mon, 14 Sep 2015 21:27:04 +0000 (21:27 +0000)]
am
46d5efcd: Add an option to include a full bootloader in incremental OTA.
* commit '
46d5efcd0d451a48cc793931efef2b1ca982386d':
Add an option to include a full bootloader in incremental OTA.
leozwang [Fri, 14 Aug 2015 17:57:58 +0000 (10:57 -0700)]
Add an option to include a full bootloader in incremental OTA.
Bug:
23101469
Bug:
23999213
Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
Tao Bao [Fri, 11 Sep 2015 22:27:56 +0000 (15:27 -0700)]
releasetools: Update the fingerprint when signing.
ro.bootimage.build.fingerprint should be updated when signing.
Bug:
22720426
Bug:
24009888
Change-Id: I5bd31858c6bc31edcecc6f5248f4274481506288
Tao Bao [Wed, 2 Sep 2015 17:28:08 +0000 (10:28 -0700)]
releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.
Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.
Bug:
23646151
Change-Id: I77bae035e39f2e0be25f7f6d71c5882464e3d50f
(cherry picked from commit
84006eacd05e3f2784a0ecdf36609767f2c34044)
Zach Jang [Tue, 1 Sep 2015 23:51:02 +0000 (23:51 +0000)]
Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
Zach Jang [Mon, 31 Aug 2015 17:12:17 +0000 (10:12 -0700)]
Set the Security Patch level with Oct 1 for MNC
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC
Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
smain@google.com [Fri, 28 Aug 2015 23:51:12 +0000 (16:51 -0700)]
Fix bug that caused table of Studio links to result in "stand-alone" tools instructions.
bug:
23570662
Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
Ying Wang [Thu, 27 Aug 2015 01:33:15 +0000 (01:33 +0000)]
am
fc168f84: resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
* commit '
fc168f84695f492f2ad0eed3063145f425bebf45':
Don't fail build of otatools if there are no device certificates
Ying Wang [Thu, 27 Aug 2015 01:27:37 +0000 (01:27 +0000)]
am
1e120181: am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
1e120181f0a9240eca61dface4fb4530bf2594ab':
Dist the otatools package.
Ying Wang [Thu, 27 Aug 2015 00:03:18 +0000 (17:03 -0700)]
resolved conflicts for merge of
1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
Ying Wang [Wed, 26 Aug 2015 20:17:16 +0000 (20:17 +0000)]
am
473b6a5f: am
fc028e59: Dist the otatools package.
* commit '
473b6a5f2b00f941acb08b5c3df59cbbdf647609':
Dist the otatools package.
Claes Elgemark [Wed, 26 Aug 2015 17:14:49 +0000 (17:14 +0000)]
am
8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '
8d771971212069f77851163f437c782f581bf6db':
Don't fail build of otatools if there are no device certificates
Claes Elgemark [Wed, 1 Apr 2015 09:29:29 +0000 (11:29 +0200)]
Don't fail build of otatools if there are no device certificates
Bug:
23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
Bart Sears [Wed, 26 Aug 2015 03:40:38 +0000 (03:40 +0000)]
Merge "Set the Security Patch level for MNC" into mnc-dev
Tao Bao [Tue, 25 Aug 2015 23:30:14 +0000 (23:30 +0000)]
am
c6e087ad: resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
* commit '
c6e087adc420ca08bfea8613c07aa51e1b4a2e3e':
add otatools-package target
Tao Bao [Tue, 25 Aug 2015 23:18:01 +0000 (16:18 -0700)]
resolved conflicts for merge of
2bcfbe7e to lmp-mr1-ub-dev
Change-Id: Ia53581aee207b0a24807767d7e80959a4fc9aff3
Konstantinos Menychtas [Tue, 25 Aug 2015 18:22:28 +0000 (18:22 +0000)]
am
e9a8f465: (-s ours) resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
* commit '
e9a8f465859137ba37786031b804864205900cb4':
Increasing all emulator system image sizes
Ying Wang [Tue, 25 Aug 2015 18:21:13 +0000 (18:21 +0000)]
am
fc028e59: Dist the otatools package.
* commit '
fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
Dist the otatools package.
Ying Wang [Tue, 25 Aug 2015 00:13:53 +0000 (17:13 -0700)]
Dist the otatools package.
Bug:
23495952
(cherry picked from commit
267e957373765ad1e3ce89abe61886a305277027)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
Konstantinos Menychtas [Tue, 25 Aug 2015 17:20:11 +0000 (10:20 -0700)]
resolved conflicts for merge of
0287a8f6 to lmp-mr1-ub-dev
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
Bart Sears [Tue, 25 Aug 2015 06:22:20 +0000 (23:22 -0700)]
Set the Security Patch level for MNC
MNC will include the security patches from the August OEM bulletin
which will have a patch date of September 1.
Bug:
23288951
Change-Id: Ia0f313bf35fa7af1efed1787006bfbb614bc8c29
Doug Zongker [Tue, 25 Aug 2015 01:20:34 +0000 (01:20 +0000)]
am
32bf3f32: add otatools-package target
* commit '
32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
add otatools-package target
Doug Zongker [Fri, 22 Aug 2014 15:04:58 +0000 (08:04 -0700)]
add otatools-package target
Add a target to zip up all the otatools and releasetools, for easy
copying to the OTA builder machine.
Change-Id: I55a6d93c1de75ac936d941c0e3ae72897407f563
(cherry picked from commit
f22b0f43efbc16c548692dc239a387edda15d78f)
smain@google.com [Thu, 20 Aug 2015 00:36:57 +0000 (17:36 -0700)]
fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover)
- revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
- remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
Konstantinos Menychtas [Tue, 18 Aug 2015 20:19:10 +0000 (20:19 +0000)]
am
dae79613: Increasing all emulator system image sizes
* commit '
dae79613cb4deb209d3428b108535715aa364f68':
Increasing all emulator system image sizes
Konstantinos Menychtas [Tue, 18 Aug 2015 17:27:04 +0000 (10:27 -0700)]
Increasing all emulator system image sizes
Size increase in system image deemed necessary after build
breakage observed on lmp-mr1-dev due to lack of space on
MIPS system image.
All system image sizes updated to match the image size
values set in MNC-dev (avoid merge conflicts, future-proof
all images against similar breakage issues).
This image size increase takes moderate space on host
device and does not affect system image download size
(images are sparse but delivered compressed anyway).
Change-Id: I2bdeb10f2d98030a358a9bc4249ce23c432de5bd
Konstantinos Menychtas [Tue, 18 Aug 2015 17:14:12 +0000 (10:14 -0700)]
Increasing MIPS emulator system image size and user-data image size
Size increase taken as a precaution against recent built breakage
due to lack of space on a number of targets (e.g. x86, ARM64).
System and user-data image sizes set to match currently most common
setup for the emulator: system image: 1.25gb, user-data image 700mb.
Change-Id: I7118eb26dd78f5fa9e4f0006e15c8d47dee8e28c
Dirk Dougherty [Sat, 15 Aug 2015 04:18:36 +0000 (21:18 -0700)]
adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
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
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:28:32 +0000 (17:28 +0000)]
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
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
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:46:58 +0000 (00:46 +0000)]
Merge "Fix issie #
23116383: Include security patch level in Settings" into mnc-dev
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
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: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:01:24 +0000 (17:01 +0000)]
Merge "Include new AOSP messaging app in base builds." into mnc-dev
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)
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 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:12:28 +0000 (19:12 +0000)]
Merge "Increasing x86 emulator system partition size" into mnc-dev
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 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
Yusuf Ozuysal [Fri, 7 Aug 2015 00:10:39 +0000 (00:10 +0000)]
Merge "Add support-customtabs to the doc build." into mnc-dev
Ying Wang [Mon, 3 Aug 2015 21:06:58 +0000 (14:06 -0700)]
Don't prepend CC_WRAPPER to CLANG.
We have deferred the CC_WRAPPER prepending to binary.mk per module.
Bug:
22612634
Change-Id: If2c0549503989d17ff7be619fdd49c26fd78f0a5
Dianne Hackborn [Fri, 31 Jul 2015 17:37:50 +0000 (17:37 +0000)]
Merge "Remove M codename, version number is 6.0." into mnc-dev
Benoit Lize [Fri, 31 Jul 2015 15:35:58 +0000 (17:35 +0200)]
Add support-customtabs to the doc build.
b/
22795013
Change-Id: I1363e5136ca15ea3089040d59de528c877fb53df
Tony Mantler [Thu, 30 Jul 2015 19:56:08 +0000 (19:56 +0000)]
Merge "Add support preference libraries to docs build" into mnc-dev
Tony Mantler [Thu, 30 Jul 2015 18:22:24 +0000 (11:22 -0700)]
Add support preference libraries to docs build
b/
22795957
Change-Id: Ia8e02fd7726102f524a16f2f84e9c2bdd4d37f8f
Tao Bao [Wed, 29 Jul 2015 21:09:23 +0000 (14:09 -0700)]
Read fstab from the source build.
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.
Bug:
21948974
Change-Id: I8b6a18f64b412f782184f9d382544ed0ce093fb4
(cherry picked from commit
dd24da9ec91b74b7e3c8d1af9f1f9f792d41ac4d)
Dianne Hackborn [Wed, 29 Jul 2015 21:22:51 +0000 (14:22 -0700)]
Remove M codename, version number is 6.0.
Change-Id: I27b477f087b135232f14157123d31da04dee04d7
Miao Wang [Wed, 29 Jul 2015 19:07:48 +0000 (19:07 +0000)]
Merge "[RenderScript] Only upgrade RS target API for compat build." into mnc-dev
Ian Pedowitz [Wed, 29 Jul 2015 18:48:26 +0000 (18:48 +0000)]
Merge "Bump PLATFORM_PREVIEW_SDK_VERSION to 3" into mnc-dev
Miao Wang [Wed, 29 Jul 2015 18:46:23 +0000 (11:46 -0700)]
[RenderScript] Only upgrade RS target API for compat build.
- Fix build
Bug:
22796994
Bug:
22693954
Change-Id: Iff91cc4691ea3e4cd8542cdf38245e2aa7724a71
Ian Pedowitz [Wed, 29 Jul 2015 17:37:24 +0000 (10:37 -0700)]
Bump PLATFORM_PREVIEW_SDK_VERSION to 3
Change-Id: I5a0ec062c2893bf1ac7fbec3ce98953283efcaf7
Miao Wang [Wed, 29 Jul 2015 00:43:51 +0000 (17:43 -0700)]
[RenderScript] Set RS_PREBUILT_LIBPATH for 64bit targets.
Bug:
22796994
Bug:
22693954
This change fixes the RS_PREBUILT_LIBPATH when used with 64-bit target
devices. It also fixes an issue where the target RenderScript API is
below 21 for 64-bit compilation. In those cases, we should always
upconvert it to 21 (since that is the first available 64-bit release).
Change-Id: I27e9d0bd5c01bac0b3b28e9002333264a55d628f
George Mount [Mon, 27 Jul 2015 14:49:18 +0000 (14:49 +0000)]
am
56f7b775: (-s ours) am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
56f7b77520f182a42e181a0f6dba78559007c532':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
George Mount [Mon, 27 Jul 2015 14:35:51 +0000 (14:35 +0000)]
am
a5841355: (-s ours) DO NOT MERGE ANYWHERE. Add data binding to built javadoc.
* commit '
a58413554455248dcaea3ad1c022316c1e3288e7':
DO NOT MERGE ANYWHERE. Add data binding to built javadoc.