Commit Graph

28389 Commits

Author SHA1 Message Date
Tianjie Xu d06f07eef4 Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.

Example of metadata:
....
post-build-incremental=2951741
post-timestamp=1465345123
pre-build-incremental=2943039
pre-device=bullhead
...

Bug: 28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
2016-06-09 17:54:46 -07: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 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
Narayan Kamath da147a7c20 Merge "Add default values for pm.dexopt.core-app." into nyc-dev 2016-06-06 14:48:05 +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
Narayan Kamath 41a3b1b413 Add default values for pm.dexopt.core-app.
bug: 28998083

Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
2016-06-02 16:35:03 +01: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
Lance Jin-woong Chang 1059f37377 Merge "Add build number to apps' version name for non-platform build" into nyc-dev 2016-05-28 18:28:40 +00:00
Baligh Uddin b4e6eb0e56 Add system/extras/verity/build_verity_metadata.py to otatools am: e718501021 am: 5d77e7e0c1
am: 9f527d5222

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

Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100
2016-05-27 23:45:56 +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 3200f49a5c DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours am: a21a89051e -s ours
am: 88582dfa7b  -s ours

* commit '88582dfa7bb9be8e87b091a7fa705b6669390f8d':
  DO NOT MERGE ANYWHERE -

Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042
2016-05-27 23:37:47 +00:00
Baligh Uddin 88582dfa7b DO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours
am: a21a89051e  -s ours

* commit 'a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
  DO NOT MERGE ANYWHERE -

Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5
2016-05-27 23:34:54 +00:00
Baligh Uddin a21a89051e DO NOT MERGE ANYWHERE -
am: 442ae0fe5c  -s ours

* commit '442ae0fe5c76ddabe52e595689a86838820ecbf1':
  DO NOT MERGE ANYWHERE -

Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433
2016-05-27 23:32:09 +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 b637cb2e99 Add system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6 am: 1e7c1290c6
am: b25a7f38a8

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

Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356
2016-05-27 22:43:20 +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
Bjoern Johansson 4f2f58791f Merge "Remove Dev Settings app from emulator images" into nyc-dev 2016-05-27 17:19:13 +00:00
Dirk Dougherty a5bce98621 Fix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804
am: 53cd365b2d

* commit '53cd365b2d2c2b074d628147a8a382275075bd1d':
  Fix improper date reference in blog reader.

Change-Id: I300892c3c4439354917872839c18e4c029160df1
2016-05-26 23:49:38 +00:00
Dirk Dougherty 53cd365b2d Fix improper date reference in blog reader. am: 2732bb762a
am: 0f6d425804

* commit '0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
  Fix improper date reference in blog reader.

Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
2016-05-26 23:46:18 +00:00
Dirk Dougherty 0f6d425804 Fix improper date reference in blog reader.
am: 2732bb762a

* commit '2732bb762a00828f36bda77c43c7fd14c7495cde':
  Fix improper date reference in blog reader.

Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
2016-05-26 23:43:35 +00:00
Dirk Dougherty 2732bb762a Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
2016-05-26 13:05:10 -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
Amanda Kassay 7bea848abd Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880 am: 0eefec03a7
am: ecaacf87cd

* commit 'ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385
2016-05-26 18:33:54 +00:00
Amanda Kassay ecaacf87cd Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880
am: 0eefec03a7

* commit '0eefec03a76e5e0201293331dd67baf52dc13ceb':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4
2016-05-26 18:28:40 +00:00
Amanda Kassay 0eefec03a7 Revert "Updated default.css and docs.js for DoD transition fallback."
am: 8bac6eb880

* commit '8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288
2016-05-26 18:22:56 +00:00
Amanda Kassay 8bac6eb880 Revert "Updated default.css and docs.js for DoD transition fallback."
This reverts commit 4d5bcbf62a.

Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918
2016-05-26 17:58:23 +00:00
Bjoern Johansson d7db5d514a Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.

BUG: 27549126

Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
2016-05-25 18:31:25 -07: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 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
Tianjie Xu 654e4fb023 Merge "Report error codes in the OTA update script" into nyc-dev 2016-05-25 20:57:20 +00:00
Zach Jang 18fb257140 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours am: 4c9d484078 am: 2823643ecd am: d5e1f1ee8e
am: 6a974cf124  -s ours

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

Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec
2016-05-25 20:52:58 +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 6a974cf124 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours am: 4c9d484078 am: 2823643ecd
am: d5e1f1ee8e

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

Change-Id: I93652c1e6e3bc3b8a2bd48a50cb8f1dbafac9d59
2016-05-25 20:44:23 +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 d5e1f1ee8e DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours am: 4c9d484078
am: 2823643ecd

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

Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4
2016-05-25 20:39:29 +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 2823643ecd DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4 am: afbf826576 -s ours
am: 4c9d484078

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

Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
2016-05-25 20:34:47 +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 4c9d484078 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff am: e496a955f4
am: afbf826576  -s ours

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

Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
2016-05-25 20:30:15 +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 afbf826576 DO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a am: 60270ec785 -s ours am: 79770b1927 -s ours am: 1fc50f59ff
am: e496a955f4

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

Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
2016-05-25 20:25:14 +00:00