Commit graph

7358 commits

Author SHA1 Message Date
Zach Jang
05a8c77e42 Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757

* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
  Update security patch string to 2016-06-01

Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5 Update security patch string to 2016-06-01
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
  Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
Zach Jang
0a3b3d40c1 Update security patch string to 2016-06-01
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Zach Jang
0cf7987b7e Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684
am: f32d07d

* commit 'f32d07dd9328401525e333a34464a1d1f363e524':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:03:47 +00:00
Zach Jang
f32d07dd93 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:00:15 +00:00
Zach Jang
6bbd684464 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:56:45 +00:00
Zach Jang
08d9bea410 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780
am: 274e483

* commit '274e48378f92c711d28876380f34e263159cb81b':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:53:20 +00:00
Zach Jang
274e48378f Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am: 175b780

* commit '175b7800f484edceee404abf21973859d5793c0d':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:49:48 +00:00
Zach Jang
87582a8758 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625
am: d7bf980

* commit 'd7bf9800f4f5fdc83b2ffb163207025459b26b36':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:56:58 +00:00
Zach Jang
d7bf9800f4 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094
am: fa24625

* commit 'fa2462551694090da0d0c941d805165c2e2f6dc2':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:54:07 +00:00
Zach Jang
fa24625516 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90
am: b90d094

* commit 'b90d09439a5901f78e9eae332f163cdc1ff98f49':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:51:24 +00:00
Zach Jang
b90d09439a Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5
am: df28b90

* commit 'df28b90a7c45a02c4ba9896ad89f745a48fac7df':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:48:45 +00:00
Zach Jang
df28b90a7c Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am: 2b71be5

* commit '2b71be536b6de0d16d0ae3224d1b00c41bec467e':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:45:26 +00:00
Zach Jang
175b7800f4 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
2016-03-21 17:42:55 -07:00
Zach Jang
b29491287c Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5
am: bbf3687

* commit 'bbf3687eb83878bbba380799c9f25af1b227bee6':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:20:22 +00:00
Zach Jang
bbf3687eb8 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724
am: 592d1c5

* commit '592d1c5a46b95015ec831febc953b17b721383e9':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:18:01 +00:00
Zach Jang
592d1c5a46 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd
am: 5b24724

* commit '5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:15:39 +00:00
Zach Jang
5b24724ccf Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd

* commit 'cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:13:25 +00:00
Zach Jang
2b71be536b Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805

b/27724967

Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
2016-03-17 17:11:47 -07:00
Zach Jang
cdbccfda83 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am: 7a498ba

* commit '7a498bafff136f1996042c6794ababcaff11d600':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:10:53 +00:00
Zach Jang
7a498bafff Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647
2016-03-17 17:04:32 -07:00
Ying Wang
e511a07677 Allow to build against Mac OS X SDK 10.11. am: 7f7c698959
am: 773b017ee9

* commit '773b017ee96ace4e4bdc176dd59fc14c979736ef':
  Allow to build against Mac OS X SDK 10.11.
2016-02-24 02:55:16 +00:00
Ying Wang
2114b48a14 Update mac_sdk_versions_supported. am: 8df3355f64
am: 0954a9d91f

* commit '0954a9d91f8f68133150a39afc364e1ad091a19b':
  Update mac_sdk_versions_supported.
2016-02-24 02:54:51 +00:00
Ying Wang
773b017ee9 Allow to build against Mac OS X SDK 10.11.
am: 7f7c698959

* commit '7f7c6989590bd9395e8ebf3a01b5b4033c89d7d1':
  Allow to build against Mac OS X SDK 10.11.
2016-02-24 02:46:46 +00:00
Ying Wang
0954a9d91f Update mac_sdk_versions_supported.
am: 8df3355f64

* commit '8df3355f64119adb9ca71c9f2cc9b51afb61c65a':
  Update mac_sdk_versions_supported.
2016-02-24 02:46:36 +00:00
Ying Wang
7f7c698959 Allow to build against Mac OS X SDK 10.11.
Bug: 24739158
Change-Id: I7c57e141dd02a0d2de5a7a1ccbc72ffe422a8d6f
2016-02-23 18:15:15 -08:00
Ying Wang
8df3355f64 Update mac_sdk_versions_supported.
Now we requires Mac OS X SDK version at least 10.8.
Also removed the unnecessary sort call in getting
mac_sdk_versions_installed.
Lexical sort doesn't make sense when 10.10 is added to that list.
Actually the next makefile line makes sure we always get the first
match in $(mac_sdk_versions_supported):
mac_sdk_version := $(firstword $(filter $(mac_sdk_versions_installed),
$(mac_sdk_versions_supported)))

Bug: 22825165
Change-Id: I4bfafabb11f94b66704d4799fe61fe3f16429538
2016-02-23 18:13:03 -08:00
Zach Jang
fc30358acb Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8 am: eb651e2e45
am: 3f53b385de

* commit '3f53b385dec6b45d0e4d07a29ce43b3c510b1d10':
  Updating security string patch to 2016-04-01
2016-02-19 22:22:57 +00:00
Zach Jang
3f53b385de Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766 am: 7e6a1633c8
am: eb651e2e45

* commit 'eb651e2e450f1756e6acea4f570379af7d146920':
  Updating security string patch to 2016-04-01
2016-02-19 22:17:28 +00:00
Zach Jang
eb651e2e45 Updating security string patch to 2016-04-01 am: e182d2a95c am: 054bbb9766
am: 7e6a1633c8

* commit '7e6a1633c8ebb622271020cbb0aedae355e6501a':
  Updating security string patch to 2016-04-01
2016-02-19 22:11:32 +00:00
Zach Jang
7e6a1633c8 Updating security string patch to 2016-04-01 am: e182d2a95c
am: 054bbb9766

* commit '054bbb9766312a2caefd5375341d49074a6d25bf':
  Updating security string patch to 2016-04-01
2016-02-19 22:06:14 +00:00
Zach Jang
054bbb9766 Updating security string patch to 2016-04-01
am: e182d2a95c

* commit 'e182d2a95c52e37d2a6f924c8ff386b52b08a0c9':
  Updating security string patch to 2016-04-01
2016-02-19 22:00:21 +00:00
Zach Jang
e182d2a95c Updating security string patch to 2016-04-01
b/27272697

Change-Id: I99c2c892a21f4c36226ea5f8d94689d6218ccf7e
2016-02-19 13:50:29 -08:00
Zach Jang
6facd249d5 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57
am: 6c61548bb7

* commit '6c61548bb7e426704760c9351e3211fb45d67dae':
  Updating security patch string to 2016-03-01
2016-01-12 01:33:23 +00:00
Zach Jang
6c61548bb7 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f
am: c9da4cce57

* commit 'c9da4cce57d387f52b675d1024459af5e73c6dbc':
  Updating security patch string to 2016-03-01
2016-01-12 01:30:53 +00:00
Zach Jang
c9da4cce57 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e
am: 53e7d9bf7f

* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
  Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang
53e7d9bf7f Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e

* commit '293887c43ee5b797f8628f5983f64bf766002009':
  Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang
293887c43e Updating security patch string to 2016-03-01
am: c24c6ccd4d

* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
  Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang
c24c6ccd4d Updating security patch string to 2016-03-01
b/26499556

Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Zach Jang
41846b0063 DO NOT MERGE - Update security string to 2016-02-01 am: 929a4abd2b
am: af970fb308

* commit 'af970fb308dd7914e8dccb56e8ea08d50e92e617':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang
8b5be4dd4f Update Security String to 2016-02-01 am: f0f73c06e2
am: 5e2b003a11

* commit '5e2b003a116c8de6bfadf4b74d0cc676e0ed0d76':
  Update Security String to 2016-02-01
2015-12-09 23:00:35 +00:00
Zach Jang
af970fb308 DO NOT MERGE - Update security string to 2016-02-01
am: 929a4abd2b

* commit '929a4abd2b777715bc730593aee87643a30706d6':
  DO NOT MERGE - Update security string to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang
5e2b003a11 Update Security String to 2016-02-01
am: f0f73c06e2

* commit 'f0f73c06e25e17ecf8e06f42c51efac102597f57':
  Update Security String to 2016-02-01
2015-12-09 14:57:15 -08:00
Zach Jang
929a4abd2b DO NOT MERGE - Update security string to 2016-02-01
b/26110717

Change-Id: Ifbb78b8c7cd5d2efa9e5501fc4e7216f336ccadc
2015-12-09 14:45:57 -08:00
Zach Jang
f0f73c06e2 Update Security String to 2016-02-01
b/26110717

Change-Id: I1085f5d053b07c6c81d2ef22fbba5ab9157a67f2
2015-12-09 20:48:10 +00:00
Zach Jang
2cd2a76c64 Update Security String to 2016-01-01 - DO NOT MERGE am: 58cdbdc5ad
am: 645f200ae8

* commit '645f200ae8708414d06618989328dc3e3c84a917':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:55:17 +00:00
Zach Jang
645f200ae8 Update Security String to 2016-01-01 - DO NOT MERGE
am: 58cdbdc5ad

* commit '58cdbdc5ad54f9c26d94860c2d0be712f88a8f07':
  Update Security String to 2016-01-01 - DO NOT MERGE
2015-11-21 00:51:39 +00:00
Zach Jang
3ce70dfe46 Update Security String to 2016-01-01 to mnc-dev am: 170459f438
am: bcf2866fb1

* commit 'bcf2866fb1ea50ea31ede70f62b864332f61b980':
  Update Security String to 2016-01-01 to mnc-dev
2015-11-21 00:51:39 +00:00
Zach Jang
bcf2866fb1 Update Security String to 2016-01-01 to mnc-dev
am: 170459f438

* commit '170459f4385d35dd991549e1b545c376ca8df281':
  Update Security String to 2016-01-01 to mnc-dev
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
Zach Jang
58cdbdc5ad Update Security String to 2016-01-01 - DO NOT MERGE
http://b/25819582

Change-Id: I99d8ca004bb5d35613f3a2314597717f6b7c04c7
2015-11-20 22:54:48 +00:00
Bart Sears
550b317688 Revert "Change version back to 6.0"
am: 55a149b740

* commit '55a149b74064b799efe9c69211a511725cb9925b':
  Revert "Change version back to 6.0"
2015-11-15 17:59:44 +00:00
Bart Sears
3a37a0cefd Change version back to 6.0
am: 970f203b3d

* commit '970f203b3d3f17b778749c3ce47eb6b922aa606c':
  Change version back to 6.0
2015-11-15 17:59:32 +00:00
Bart Sears
55a149b740 Revert "Change version back to 6.0"
This reverts commit 970f203b3d.

Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
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
Vince Harron
ba740ff57f Switch emulator to generate userdebug images by default
This is primarily to avoid using the unsupported JIT on Android-M

It will increase app install times significantly because the app will
be compiled at install time.  OTOH, It should improve application
performance dramatically.

Change-Id: Id1d637ec561db177fd52e4c111f4def2a1b45543
(cherry picked from commit 08787d747d71d7ff3f13d2275d937faefc6d7777)
2015-11-11 16:32:54 +00:00
Zach Jang
fe64ce145e Update security string to 2015-12-01 - DO NOT MERGE am: 6575d4a2a8
am: cc9ac27157

* commit 'cc9ac271575b4c1ef3a2bff3fbdaf2b201c6e75d':
  Update security string to 2015-12-01 - DO NOT MERGE
2015-10-26 23:46:01 +00:00
Zach Jang
cc9ac27157 Update security string to 2015-12-01 - DO NOT MERGE
am: 6575d4a2a8

* commit '6575d4a2a8c78a703e5c2e2889ecb358668d1bbd':
  Update security string to 2015-12-01 - DO NOT MERGE
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
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
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
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
f694d37895 resolved conflicts for b161297d to lmp-mr1-ub-dev
Change-Id: I9bfac79b7d0cc7c6a3e501b15d5bd91781e6246e
2015-09-21 13:00:04 -07: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
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
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
Zach Jang
47ef4c3467 DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Zach Jang
4c710cbe7f DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:21:39 +00:00
Zach Jang
9f7c37811b am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
  Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:04:40 +00:00
Tao Bao
ccad82c52e Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 2015-09-01 19:02:24 +00:00
Zach Jang
4d034675f0 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
2015-08-31 10:12:17 -07:00
Ying Wang
d0cc11e898 am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
  Dist the otatools package.
2015-08-27 01:37:53 +00:00
Ying Wang
8f7c08ed62 am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
  Dist the otatools package.
2015-08-27 01:27:37 +00:00
Tao Bao
7540c08807 Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit d07bfc5196.

Real fixes [1][2][3] are ready to merge. Time to revert the workaround.

[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49

Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
2015-08-26 15:29:00 -07:00
Ying Wang
1e120181f0 am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
  Dist the otatools package.
2015-08-26 20:17:16 +00:00
Claes Elgemark
1a8c656704 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
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121 Don't fail build of otatools if there are no device certificates
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Bart Sears
8a1fa15844 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
2015-08-26 03:49:10 +00:00
Ying Wang
473b6a5f2b am fc028e59: Dist the otatools package.
* commit 'fc028e59c2bc36297f23cdf2ee4fe9b1b60aa1cd':
  Dist the otatools package.
2015-08-25 18:21:13 +00:00
Ying Wang
fc028e59c2 Dist the otatools package.
Bug: 23495952

(cherry picked from commit 267e957373)

Change-Id: I49fcb9fed599268a9d37de7b14280eeb65c34788
2015-08-25 11:13:56 -07:00
Bart Sears
0bb3145b56 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
2015-08-24 23:22:20 -07:00
Doug Zongker
2bcfbe7e88 am 32bf3f32: add otatools-package target
* commit '32bf3f32651ddff9ffa2168017d71ec4b151a0a9':
  add otatools-package target
2015-08-25 01:20:34 +00:00
Doug Zongker
32bf3f3265 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)
2015-08-24 15:43:40 -07:00
Chris Banes
98c570abb2 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
2015-08-13 17:36:49 +00:00
Chris Banes
b916a5bcbc Make sure only AppCompat (not it's tests) are in the docs
BUG: 23169683

Change-Id: I6ab3b8c89eba17920f1265021c7960819e4371ab
2015-08-13 10:42:02 +01:00
Dianne Hackborn
897f3ba8b1 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
2015-08-13 00:54:30 +00:00
Dianne Hackborn
25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Ian Pedowitz
c79c7d152f 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:41:08 +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
e2312db19a am 38ffb0cf: Bump PLATFORM_PREVIEW_SDK_VERSION to 4
* commit '38ffb0cf899d94cb72409519bd25dc94048dd719':
  Bump PLATFORM_PREVIEW_SDK_VERSION to 4
2015-08-11 16:17:29 +00:00
Ian Pedowitz
38ffb0cf89 Bump PLATFORM_PREVIEW_SDK_VERSION to 4
Change-Id: Ia44cfc3ff839c9ec84aec32e37c42b96de67075e
2015-08-11 07:50:04 -07:00
Furquan Shaikh
ffe86de5d0 Merge "vboot_signer: Add kernel subkey required for signing kernel keyblock" into mnc-dr-dev 2015-08-09 08:38:07 +00:00