Commit Graph

9862 Commits

Author SHA1 Message Date
Lance Chang
aef86f7f4c Add build number to apps' version name for non-platform build
If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.

Bug: 28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863
2016-05-26 12:32:30 -07:00
Adam Powell
233e8ae762 Merge "N is API 24" into nyc-dev
am: f211cae2ed

* commit 'f211cae2ede701b58228ff0090bb894f17c0557f':
  N is API 24

Change-Id: I8c04bfc700731a1441365f8d0d86a2c54aa3a305
2016-05-26 01:19:50 +00:00
TreeHugger Robot
f211cae2ed Merge "N is API 24" into nyc-dev 2016-05-26 01:03:09 +00:00
Adam Powell
891d86d492 N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
2016-05-25 16:48:56 -07:00
Zach Jang
7b164ae47e Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd am: cf227d4401
am: e29b42ffef

* commit 'e29b42ffef47991c090ca8008a9addb9e479fc2a':
  Updating security string to 2016-07-05

Change-Id: Ide9c0807d54ed1bab3dc65e0f1c04a4bb856ace2
2016-05-25 21:11:11 +00:00
Zach Jang
e29b42ffef Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83 am: 4af9b20fbd
am: cf227d4401

* commit 'cf227d440176f5c10b252ff75fdc6aabf7d4829d':
  Updating security string to 2016-07-05

Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
2016-05-25 21:02:20 +00:00
Zach Jang
cf227d4401 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4 am: db34ed5f83
am: 4af9b20fbd

* commit '4af9b20fbd847ffab365a4677de0e9752737c4f3':
  Updating security string to 2016-07-05

Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109
2016-05-25 20:57:41 +00:00
Zach Jang
4af9b20fbd Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0 am: bf5d08ecf4
am: db34ed5f83

* commit 'db34ed5f83efc646f37eae8ee61233ee2c2e4979':
  Updating security string to 2016-07-05

Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
2016-05-25 20:52:57 +00:00
Zach Jang
db34ed5f83 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad am: 7cc20fe0a0
am: bf5d08ecf4

* commit 'bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
  Updating security string to 2016-07-05

Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
2016-05-25 20:44:22 +00:00
Zach Jang
bf5d08ecf4 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am: e7660e56ad
am: 7cc20fe0a0

* commit '7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
  Updating security string to 2016-07-05

Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
2016-05-25 20:39:28 +00:00
Zach Jang
7cc20fe0a0 Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f
am: e7660e56ad

* commit 'e7660e56ad330c8469857014c448130143c86856':
  Updating security string to 2016-07-05

Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
2016-05-25 20:34:46 +00:00
Zach Jang
e7660e56ad Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am: ab6c08949f

* commit 'ab6c08949f2a96867b1eda536eeb74982a49d5d3':
  Updating security string to 2016-07-05

Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
2016-05-25 20:30:14 +00:00
Zach Jang
60270ec785 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375
am: 555c5af89a

* commit '555c5af89a4b25f61ff827431b0081be7b70d5fe':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
2016-05-25 20:07:30 +00:00
Zach Jang
555c5af89a DO NOT MERGE Updating security string to 2016-07-05
am: f885e95375

* commit 'f885e95375a48aeefd7d2451a5c61a48100bac77':
  DO NOT MERGE Updating security string to 2016-07-05

Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
2016-05-25 20:03:05 +00:00
Zach Jang
f885e95375 DO NOT MERGE Updating security string to 2016-07-05
b/28912173

Change-Id: I81301d51fd62932005a24178c57a0731566910a6
2016-05-25 19:43:28 +00:00
Zach Jang
ea3b024d7d Updating security string to 2016-07-05
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
2016-05-25 12:38:46 -07:00
Mohamad Ayyash
dfec815882 Pass squashfs block size as a parameter
BUG: 28920352
Change-Id: Ifed02bd1565131814047991ec87fa61691bfe240
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-05-24 20:55:13 +00:00
Zach Jang
fbf01117d3 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c
am: f8a869d5d8

* commit 'f8a869d5d8a3989e240cde063322f9441ad35d16':
  Updating security string to 2016-07-01

Change-Id: I6f30c8da2bb3476dcb2a0d3e5befca81dbd66c0d
2016-05-24 01:22:06 +00:00
Zach Jang
f8a869d5d8 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c
am: 3ffee87b5c

* commit '3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
  Updating security string to 2016-07-01

Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
2016-05-24 01:19:54 +00:00
Zach Jang
3ffee87b5c Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07
am: 2d75d4447c

* commit '2d75d4447ca47666b20fe91e595a3274c8a975cf':
  Updating security string to 2016-07-01

Change-Id: I59ad6e51072d854b052873a0ec32d8de2cdf5a1d
2016-05-24 01:17:01 +00:00
Zach Jang
2d75d4447c Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64
am: 608f329e07

* commit '608f329e0718a9ef3ed89b3f9d4768b003bc88de':
  Updating security string to 2016-07-01

Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76
2016-05-24 01:14:26 +00:00
Zach Jang
608f329e07 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d
am: 3e082f1e64

* commit '3e082f1e649821f00ec751824e901f64a2756269':
  Updating security string to 2016-07-01

Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
2016-05-24 01:11:45 +00:00
Zach Jang
3e082f1e64 Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78
am: 0b4608ca4d

* commit '0b4608ca4d8b10af335f839350a4224a198e8dee':
  Updating security string to 2016-07-01

Change-Id: I08d096476c645d304ab5038cd5ca586073424157
2016-05-24 01:09:15 +00:00
Zach Jang
2ee84bf0a5 DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01
am: 0bdac8fba3

* commit '0bdac8fba335f4e1620871bf5082dbebc55a497d':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
2016-05-24 01:06:37 +00:00
Zach Jang
0b4608ca4d Updating security string to 2016-07-01 am: 45ff24a04b
am: 1dd3095e78

* commit '1dd3095e780dc83aa1b4056f298a4678bead075a':
  Updating security string to 2016-07-01

Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
2016-05-24 01:06:37 +00:00
Zach Jang
1dd3095e78 Updating security string to 2016-07-01
am: 45ff24a04b

* commit '45ff24a04bd5d3af706ae3aa6266106560070a3d':
  Updating security string to 2016-07-01

Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
2016-05-24 01:02:06 +00:00
Zach Jang
0bdac8fba3 DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am: 89f6f7aa01

* commit '89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62
2016-05-24 01:02:05 +00:00
Zach Jang
45ff24a04b Updating security string to 2016-07-01
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
2016-05-23 13:26:32 -07:00
Zach Jang
89f6f7aa01 DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only

b/28912173

Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
2016-05-23 13:19:30 -07:00
Baligh Uddin
6187c1dabe Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
am: 0418406186

* commit '0418406186f67096a3c42fa276799095620e2296':
  Add Oem Props to otatools package

Change-Id: I11ac21e62912328ec5bb19cb4b341c5b8e331ba1
2016-05-21 00:31:19 +00:00
Baligh Uddin
0418406186 Merge commit '9b4daacaf8f7ce5a534fae524507e4a4f7622ce4' into nyc-dev 2016-05-20 17:27:18 -07:00
Baligh Uddin
9b4daacaf8 Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev 2016-05-20 17:14:04 -07:00
Baligh Uddin
6c70b85cb3 Merge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am: 275af3429f

* commit '275af3429f3049378862883dc6a0db2701f9311f':
  Add Oem Props to otatools package

Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
2016-05-21 00:04:37 +00:00
Baligh Uddin
275af3429f Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev 2016-05-20 16:59:14 -07:00
Baligh Uddin
8c0c5e6149 Merge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am: 50cae53b10

* commit '50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
  Add Oem Props to otatools package

Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
2016-05-20 23:50:56 +00:00
Baligh Uddin
50cae53b10 Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev 2016-05-20 16:44:27 -07:00
Baligh Uddin
c1937df4b1 Add Oem Props to otatools package
am: 4f8df41cef

* commit '4f8df41ceff7434ece651737b15bf1035f5549e8':
  Add Oem Props to otatools package

Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
2016-05-20 18:43:25 +00:00
Baligh Uddin
4f8df41cef Add Oem Props to otatools package
Bug: 23967152
2016-05-20 11:29:53 -07:00
Alan Viverette
6685bcf54c Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am: 88b0d6a63d

* commit '88b0d6a63d8149d14032d298eccde79a6d3079d4':
  Add documents-archive to SDK, docs builds

Change-Id: Ibf8c94e84df0f7468b546dbe8e7d60eb9e996118
2016-05-19 19:48:48 +00:00
Alan Viverette
88b0d6a63d Merge "Add documents-archive to SDK, docs builds" into nyc-dev 2016-05-19 19:39:11 +00:00
Baligh Uddin
74da4d6eef DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.

Bug: 23967152
2016-05-19 08:50:19 -07:00
Tao Bao
dd24d65d2f Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev 2016-05-18 21:59:48 +00:00
Tao Bao
295ad1f1f1 Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
This reverts commit 439971af5d.

Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc
2016-05-18 12:22:33 -07:00
Alex Klyubin
eea3802b2c Merge "Uncompress native libs only if they are compressed." into nyc-dev
am: 451b72438e

* commit '451b72438e974a10f3f9062ced5d455d3234e4dd':
  Uncompress native libs only if they are compressed.

Change-Id: I9b4f21468db91955b021c744e83efba8b126dc0e
2016-05-18 16:25:46 +00:00
Alex Klyubin
587484abe5 Uncompress native libs only if they are compressed.
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.

Bug: 27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
2016-05-17 13:33:34 -07:00
Alan Viverette
fae17a418c Merge "Add missing support library projects to pathmap" into mnc-ub-dev am: 5b30101722
am: c608284d22

* commit 'c608284d22b95733e6b3a24f84084d9268eeabdf':
  Add missing support library projects to pathmap

Change-Id: I0e2d265dbdde5ec6d8c5c5588e5a8e505be46c74
2016-05-16 15:04:40 +00:00
Alan Viverette
c608284d22 Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am: 5b30101722

* commit '5b3010172211583034d1cf5eac41583dae79d77a':
  Add missing support library projects to pathmap

Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
2016-05-16 15:01:38 +00:00
Patrick Tjin
f3b0dc290e Makefile: exclude cache symlink on devices with no cache partition
rsync will complain due to broken cache symlink on devices
without cache partition when creating the recovery disk.
Recovery does not depend on /cache.

Bug: 28747374
Change-Id: Ie2dc6e84194fbc3bbb39fe59ef92a6e8936b71e2
2016-05-13 15:26:09 -07:00
Alan Viverette
e5368fa373 Add documents-archive to SDK, docs builds
Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472
2016-05-13 14:17:33 -04:00
Alan Viverette
55e80ef5c4 Add missing support library projects to pathmap
Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409
2016-05-13 14:15:25 -04:00