Commit Graph

9793 Commits

Author SHA1 Message Date
Jeff Hao
23fde1f020 Skip uses-library check for preopted apps.
am: b00263f96a

Change-Id: I216faedc383fa289df564ba73e7ae093dad1517c
2016-06-14 02:15:40 +00:00
Jeff Hao
b00263f96a Skip uses-library check for preopted apps.
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13 17:32:06 -07:00
Daniel Micay
c20df7057d disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit f2ac912b19)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-12 21:19:56 +00:00
Tao Bao
c3c17534da Track the name change for wipe_ab.
Bug: 27253717
Change-Id: I0d4c91e99267afdc4846ea50e602a2383898b9b4
2016-06-10 10:14:14 -07:00
Vineeta Srivastava
323f0f9407 Whitelist verizon as local module owner.
Change-Id: I807ac61688e6f5862de521e3c9b960dd64eed1f6
2016-06-09 11:12:52 -07:00
Ian Pedowitz
dc15ebc26c Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"
This reverts commit 5fcdec083e.

Bug: 29194920
Bug: 28809789
2016-06-07 20:24:13 -07:00
Ian Pedowitz
0c822614f5 Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am: ddc0c5e0a0

Change-Id: I9c08a086b508b78ddecc53e0aae08d25460f0595
2016-06-08 03:09:44 +00:00
Ian Pedowitz
ddc0c5e0a0 Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev 2016-06-08 03:05:40 +00:00
Gustav Sennton
61e811370d Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am: 837b86aa56

* commit '837b86aa5696fea28a0acfde7361a3c5d5824624':
  Add variable PRODUCT_SHIPPING_API_LEVEL.

Change-Id: I8beb5632ed9db8cade04bf8792b5874f761c039e
2016-06-07 16:32:33 +00:00
Gustav Sennton
837b86aa56 Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev 2016-06-07 16:21:16 +00:00
Ian Pedowitz
7a50757731 NYC is 7.0
Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c
2016-06-06 17:08:18 +00:00
Ian Pedowitz
5fcdec083e Removing N from PLATFORM_VERSION_ALL_CODENAMES
Change-Id: I328dfa703faf2bd3232f68102d5c7f4b379df030
Fixes: 29117805
2016-06-06 10:06:39 -07:00
Ian Pedowitz
637c0192fc resolve merge conflicts of f2304ce to nyc-mr1-dev
Change-Id: I0a2777aaf06ab70a1b0dfe96ff6ba6b165b0101b
2016-06-03 12:33:43 -07:00
Ian Pedowitz
216b1ed2f5 Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev 2016-06-03 18:11:03 +00:00
Ian Pedowitz
f2304ce367 NYC is now REL
PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121
2016-06-03 09:40:41 -07:00
Gustav Sennton
81ee18670d Add variable PRODUCT_SHIPPING_API_LEVEL.
PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with.

We use this variable to set a read-only property that can be used in
CTS/GTS tests.

Bug: 26381401
Change-Id: I9dfeaf423146c35f57e69ac26c27e8a9e205bc4f
2016-06-03 09:11:34 +00:00
Tao Bao
6af05e733c Merge "Add support for TARGET_RECOVERY_BRICK." into nyc-mr1-dev 2016-06-02 21:46:07 +00:00
Daniel Micay
02ab355d1c disable unpriv perf by default in user{,debug} builds
am: 888a623881

* commit '888a6238810b4c3c00108cb92f9755e74acd9ecf':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Ifd28052fe19232461afe26bbde7be42f7f11d9fb
2016-06-02 02:05:15 +00:00
Daniel Micay
888a623881 disable unpriv perf by default in user{,debug} builds
(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6
2016-06-01 17:01:18 -07:00
Tao Bao
3051f4f11a Add support for TARGET_RECOVERY_BRICK.
TARGET_RECOVERY_BRICK specifies the file that lists all the partitions
to be bricked under recovery. The file, if present, will be copied to
'$(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.brick'.

Bug: 27253717
Change-Id: Id84195b5ee1031a83bf7a077be070a3728416580
2016-06-01 15:18:06 -07:00
Ian Pedowitz
a9bc052032 Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""
This reverts commit 295ad1f1f1.

Bug: 28713307
Change-Id: Icd4d48f54840cd831780e11386a74c3e1c5ae370
2016-05-31 22:55:18 +00:00
Lance Chang
df1fff12fe Merge "Add build number to apps\' version name for non-platform build" into nyc-dev
am: 1059f37377

* commit '1059f37377fd37cc311db522b4b5689086480d17':
  Add build number to apps' version name for non-platform build

Change-Id: Ib3cbad8f4a242341319b9c3dbe0322588d63b4ea
2016-05-28 18:43:57 +00:00
Baligh Uddin
9f527d5222 Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021
am: 5d77e7e0c1

* commit '5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc
2016-05-27 23:42:55 +00:00
Baligh Uddin
5d77e7e0c1 Add system/extras/verity/build_verity_metadata.py to otatools
am: e718501021

* commit 'e718501021dd039875745d3ff829341c2bb05248':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79
2016-05-27 23:40:02 +00:00
Baligh Uddin
e718501021 Add system/extras/verity/build_verity_metadata.py to otatools
Bug: 29008004
2016-05-27 16:28:36 -07:00
Baligh Uddin
442ae0fe5c DO NOT MERGE ANYWHERE -
Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423
2016-05-27 23:19:57 +00:00
Baligh Uddin
b25a7f38a8 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6
am: 1e7c1290c6

* commit '1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d
2016-05-27 22:40:22 +00:00
Baligh Uddin
1e7c1290c6 Add system/extras/verity/build_verity_metadata.py to otatools
am: d26a99c3c6

* commit 'd26a99c3c6903c02c5435ec5f0123f057527b0a9':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232
2016-05-27 22:37:29 +00:00
Baligh Uddin
d26a99c3c6 Add system/extras/verity/build_verity_metadata.py to otatools
Bug: 29008004
2016-05-27 15:19:31 -07:00
Badhri Jagan Sridharan
e053d5c56f Merge "Extract public key ID from cert" into nyc-mr1-dev 2016-05-27 15:46:06 +00:00
Badhri Jagan Sridharan
3af315aed5 Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.

BUG: 28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
2016-05-26 17:35:50 -07:00
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