Hans Boehm
8638de1f6f
am ab4d8594
: Switch from Calculator to ExactCalculator
...
* commit 'ab4d8594591b715934d7a1106d5284e9721070ba':
Switch from Calculator to ExactCalculator
2015-10-13 03:49:41 +00:00
Hans Boehm
ab4d859459
Switch from Calculator to ExactCalculator
...
Bug: 24875598
Use ExactCalculator for AOSP builds.
This is a manual (due to intervening commits) cherrypick of
commit 53c5891460
(ag/748830).
Change-Id: I6c0acef640e62f8a70b7b2832b7eea662a0d301b
2015-10-12 17:08:04 -07:00
Tao Bao
ed48af8d5b
am b03d55aa
: Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
...
* commit 'b03d55aaeb5962690631ed1a25d8e628667d8ad2':
DO NOT MERGE: Only use a fixed timestamp when packaging.
2015-10-12 18:42:21 +00:00
Tao Bao
b03d55aaeb
Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev
2015-10-12 18:39:11 +00:00
Ying Wang
43f24a323c
am aecadc06
: Merge "Don\'t add build number to apps\' version name for platform build." into mnc-dr-dev
...
* commit 'aecadc06bf49a747c6e0c42dbe8cc73451360db2':
Don't add build number to apps' version name for platform build.
2015-10-12 17:28:03 +00:00
Ying Wang
aecadc06bf
Merge "Don't add build number to apps' version name for platform build." into mnc-dr-dev
2015-10-12 17:22:45 +00:00
Tao Bao
338da607e8
DO NOT MERGE: Only use a fixed timestamp when packaging.
...
This CL changes to use a fixed timestamp only when packaging
into the target_files zip.
Bug: 24377993
Change-Id: I01d136f4b99e1eff80c559192d93db83a3c5c0a4
(cherry picked from commit 822f5840c0
)
2015-10-12 09:55:26 -07:00
Joe Fernandez
fed4cf896d
am 1b5eef1b
: am b16edb5f
: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
...
* commit '1b5eef1b490cc143474ec74d58369aac9bf6629e':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-10 00:08:09 +00:00
Joe Fernandez
1b5eef1b49
am b16edb5f
: Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
...
* commit 'b16edb5f3ef9032b7e19c29aac2496c34bb8ac76':
add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
2015-10-09 23:59:07 +00:00
Joe Fernandez
b16edb5f3e
Merge "add unique ID to each windows download link. These IDs are necessary for the TOS wall to identify which link should be applied to the download button." into mnc-dev
2015-10-09 23:54:46 +00:00
smain@google.com
3d59345527
add unique ID to each windows download link.
...
These IDs are necessary for the TOS wall to identify which link should be applied to the download button.
Change-Id: I1b5b8b516a5b8d7fd8433c02011cb4fb2044b71f
2015-10-09 16:30:05 -07:00
Zach Jang
a9b2f3030f
am 124a59ae
: Reverting Android Security Patch Level string back to 2015-10-01
...
* commit '124a59aecc0323c1c80469c3ad5d22305c279a49':
Reverting Android Security Patch Level string back to 2015-10-01
2015-10-06 01:21:03 +00:00
Zach Jang
124a59aecc
Reverting Android Security Patch Level string back to 2015-10-01
...
Change-Id: I0ecc1c9103e7686dffcb8b7009d52aa8d546ae0b
2015-10-05 18:01:12 -07:00
Brian Carlstrom
848b8e9d2c
am fa2ce3b3
: am f73f79f1
: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
...
* commit 'fa2ce3b38be8889a0ccaa5968ebdeae80f33b0de':
Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:53:49 +00:00
Brian Carlstrom
fa2ce3b38b
am f73f79f1
: Merge "Use /filelist when OUT_DIR is set" into mnc-dev
...
* commit 'f73f79f1b63c7cb7679264a6c6e4f86fdd78309c':
Use $OUT_DIR/filelist when OUT_DIR is set
2015-10-04 19:47:22 +00:00
Brian Carlstrom
f73f79f1b6
Merge "Use $OUT_DIR/filelist when OUT_DIR is set" into mnc-dev
2015-10-04 19:40:41 +00:00
Claes Elgemark
1b045b3d66
am 5b08efb7
: (-s ours) Don\'t fail build of otatools if there are no device certificates
...
* commit '5b08efb73f1b114f6dfdb52284738f7210d0cf7e':
Don't fail build of otatools if there are no device certificates
2015-10-01 14:03:40 +00:00
Brian Carlstrom
f2257427d9
Use $OUT_DIR/filelist when OUT_DIR is set
...
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
2015-09-30 20:36:15 -07:00
Baligh Uddin
d9cdf5be20
am 22ff0124
: (-s ours) Merge "add otatools-package target" into cw-d-mr1-dev
...
* commit '22ff0124fdde970072cea303b4328024994cd78c':
add otatools-package target
2015-09-30 18:39:15 +00:00
Ying Wang
98f3c213df
am cb31a535
: Dist the otatools package.
...
* commit 'cb31a535077947e45a97ef31a04b6a3b211ceb25':
Dist the otatools package.
2015-09-29 21:57:09 +00:00
Claes Elgemark
5b08efb73f
Don't fail build of otatools if there are no device certificates
...
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
(cherry picked from commit 8d77197121
)
2015-09-29 21:56:03 +00:00
Baligh Uddin
22ff0124fd
Merge "add otatools-package target" into cw-d-mr1-dev
2015-09-29 21:53:25 +00:00
Ying Wang
cb31a53507
Dist the otatools package.
...
Bug: 23495952
(cherry picked from commit 267e957373
)
Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
(cherry picked from commit fc028e59c2
)
2015-09-29 21:50:48 +00:00
Doug Zongker
173219d81f
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 f22b0f43ef
)
(cherry picked from commit 32bf3f3265
)
2015-09-29 21:50:39 +00:00
Ying Wang
b1bee75f79
am 3d6e194e
: am 393c6254
: Really include drawables for all densities.
...
* commit '3d6e194eafbb441c79d4cd306af85eeb34fb75e8':
Really include drawables for all densities.
2015-09-29 18:13:03 +00:00
Ying Wang
3d6e194eaf
am 393c6254
: Really include drawables for all densities.
...
* commit '393c62549a6340b3473f14b71d583e118d7e6a6d':
Really include drawables for all densities.
2015-09-29 18:07:41 +00:00
Ying Wang
393c62549a
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-09-29 09:57:41 -07:00
Zach Jang
3ab4658741
am 92da6bdb
: am 5e858e3d
: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
...
* commit '92da6bdb09e0c64996aee54da9c088f37dcc0724':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
2015-09-28 21:33:30 +00:00
Zach Jang
92da6bdb09
am 5e858e3d
: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
...
* commit '5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
2015-09-28 21:27:22 +00:00
Zach Jang
5e858e3db9
Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev
2015-09-28 21:17:41 +00:00
Stephen Hines
5e70468657
Add ld.mc as a requirement for core_tiny.mk as well.
...
Bug: 24171451
I missed this when I initially added ld.mc as a requirement for
core_minimal.mk. This is required for RenderScript linking on the
device.
Change-Id: Ie3ffa2454214f886c38387f45b34df2dcbebd6e6
(cherry picked from commit 446ae75fb7
)
2015-09-22 12:54:54 -07:00
Zach Jang
1a78a8e7fb
Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
...
Change-Id: I80e1e5766c33f1a5c1e28e456dfe902bc8886fd4
2015-09-21 17:42:49 -07:00
Zach Jang
d3d0347be0
am 6a0bdb55
: am 64685ea3
: 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 '6a0bdb551810df79a3561ebe4f1cfcde8583659b':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:13:22 +00:00
Zach Jang
3a5be13442
am 22e66b35
: am a5842d3e
: am f694d378
: (-s ours) resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
* commit '22e66b357450bc89d2e9426eddfd7d8ca9c50bc0':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:13:21 +00:00
Zach Jang
6a0bdb5518
am 64685ea3
: 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 '64685ea320f8916087b8fd022ab1ce3028bec62a':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:04:43 +00:00
Zach Jang
22e66b3574
am a5842d3e
: am f694d378
: (-s ours) resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
* commit 'a5842d3e17f2d619f5de7bfae85f58ff9642dae4':
DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-22 00:04:42 +00:00
Zach Jang
64685ea320
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
2015-09-21 23:57:06 +00:00
Zach Jang
a5842d3e17
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
2015-09-21 23:57:04 +00:00
Ying Wang
b79e8771ae
Don't add build number to apps' version name for platform build.
...
Bug: 24201956
Change-Id: I4a4bb483bb7b1bf7b7a856050d548bee4db0fe93
2015-09-21 15:13:09 -07:00
Zach Jang
ef02406452
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
2015-09-21 21:06:10 +00:00
Zach Jang
f694d37895
resolved conflicts for b161297d
to lmp-mr1-ub-dev
...
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07:00
Zach Jang
0961150929
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
2015-09-21 19:05:35 +00:00
Zach Jang
b161297d4b
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
2015-09-21 19:05:33 +00:00
Zach Jang
63712481f0
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
2015-09-21 18:58:22 +00:00
Zach Jang
ab095b445a
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
2015-09-21 18:58:10 +00:00
Zach Jang
bb97ff5941
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
2015-09-17 20:40:28 +00:00
Zach Jang
a7168e1c6e
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
2015-09-17 20:27:20 +00:00
Zach Jang
e539537d8c
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
2015-09-17 20:16:43 +00:00
Zach Jang
7f96f4f6b9
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
2015-09-17 20:04:23 +00:00
Zach Jang
48e2b43e8c
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
2015-09-17 20:04:17 +00:00