Zach Jang
bcf2866fb1
Update Security String to 2016-01-01 to mnc-dev
...
am: 170459f438
2015-11-21 00:48:16 +00:00
Zach Jang
170459f438
Update Security String to 2016-01-01 to mnc-dev
...
http://b/25819582
Change-Id: Ie55f9476110b08591da05774f582a6e48ce12de7
2015-11-20 22:55:19 +00:00
Bart Sears
55a149b740
Revert "Change version back to 6.0"
...
This reverts commit 970f203b3d
2015-11-15 17:57:13 +00:00
Bart Sears
970f203b3d
Change version back to 6.0
...
Temporarily set the version back to 6.0 and security patch to
2015-11-01.
Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b
2015-11-14 23:50:18 -08:00
Zach Jang
dfd3524f7b
Merge "Update security string to 2015-12-01" into mnc-dev
...
am: 54cb940c4a
2015-10-27 00:44:56 +00:00
Zach Jang
54cb940c4a
Merge "Update security string to 2015-12-01" into mnc-dev
2015-10-27 00:37:40 +00:00
Zach Jang
07e2c19536
Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157 am: fe64ce145e -s ours
...
am: 0e8cf97670
2015-10-26 23:52:50 +00:00
Zach Jang
0e8cf97670
Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8 am: cc9ac27157
...
am: fe64ce145e
2015-10-26 23:49:22 +00:00
Zach Jang
fe64ce145e
Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8
...
am: cc9ac27157
2015-10-26 23:46:01 +00:00
Zach Jang
cc9ac27157
Update security string to 2015-12-01 - DO NOT MERGE
...
am: 6575d4a2a8
2015-10-26 23:42:57 +00:00
Zach Jang
19eec07122
Update security string to 2015-12-01
...
Change-Id: I2e07d57e457effdcf685203dabfcfefa47c70bf3
2015-10-22 15:03:14 -07:00
Zach Jang
6575d4a2a8
Update security string to 2015-12-01 - DO NOT MERGE
...
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07:00
Ian Pedowitz
0a20c942c4
Bump Android to 6.0.1
...
Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
2015-10-22 21:46:00 +00:00
Zach Jang
0f1512bc03
Update security string to 2015-12-01
...
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
2015-10-19 17:57:33 -07:00
Tao Bao
09ee6daa7f
am bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
...
* commit 'bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
2015-10-17 01:19:15 +00:00
Tao Bao
bc5e85afc9
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
2015-10-17 01:15:39 +00:00
Tao Bao
46ae586ab2
am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
...
* commit 'e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
2015-10-17 00:09:35 +00:00
Tao Bao
e09359abc0
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
...
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit aac4ad56b66f0b219ac56f0b219ac5
2015-10-16 15:47:51 -07:00
Tao Bao
3203bc10f0
DO NOT MERGE releasetools: Always write the last block if it's padded.
...
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug: 24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit 7589e961a7
2015-10-16 14:46:46 -07:00
Dan Willemsen
57a64e015c
Add all-named-(dirs|files)-under and related
...
To consolidate the number of places that we're using 'find' in the tree,
add some more helpers:
all-named-dirs-under
all-subdir-named-dirs
all-named-files-under
all-subdir-named-files
This change also makes many of the current helpers use these helpers
instead of using their own implementation.
The 'dirs' helpers are using '-type d' so that they only output
directories. It's probably safe to use '-type f' for the files helpers,
but that increased the kati load time by ~20%.
Bug: 24204119
Change-Id: I3312e2fe8c146f10955e1d986ad15d9c8be494e1
2015-10-13 16:14:57 -07:00
Dan Willemsen
7a74e5ee0e
Add all-cpp-files-under
...
There are multiple versions of this in the tree. Let's standardize on
one that will work for everyone, and will sort the results.
Bug: 24204119
Change-Id: I09fcd80e1e8e35e64d8a8a62bbc096f87b02603f
2015-10-13 16:14:53 -07:00
Dan Willemsen
76a89d3a0a
Sort all files found via $(shell find)
...
Don't rely on filesystem ordering to make these the same for all builds.
Bug: 24204119
Change-Id: I7313062157764091acecf45f4b57405c28858546
2015-10-13 16:14:12 -07: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
2015-10-12 17:08:04 -07: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
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
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
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
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
Brian Carlstrom
f2257427d9
Use $OUT_DIR/filelist when OUT_DIR is set
...
Change-Id: Iadf3f05e752d71371d3d74e670ade3e937b1cd92
2015-09-30 20:36:15 -07: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
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
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
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
