Commit Graph

275 Commits

Author SHA1 Message Date
Colin Cross 63fe36abbe Use ifndef or ifeq () instead of ifeq ""
ifeq with quotes is technically correct make syntax, but rarely used.
Replace it with the simpler ifndef when comparing against empty, or
with parenthesis for consistency.

Test: builds
Change-Id: Idcbe0586c4626c67d560694596b0bd9f5f93484a
2017-02-21 17:29:10 -08:00
Colin Cross d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Benoit Lamarche 0e61b46673 resolve merge conflicts of e04c941 to stage-aosp-master
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
2016-12-06 11:32:41 +01:00
Yohann Roussel 5360e0160b Set platform min sdk for Jack to o-b1
Test: m core-all
(cherry picked from commit 94acfe908b3e70cdd11920c92715ef06de7ed212)

Change-Id: I26a558677f2fa8ede09ad1ae7f31b786c4ba0a43
2016-12-02 08:36:24 +00:00
Akshay Thakker d634094543 Set N-MR1 to version 7.1.1.
N-MR1 is based on NDR. It has the same API level (25) but includes a few
more bug fixes and is going out to all devices. Hence 7.1.1.

Bug: 31859390
Change-Id: Iaf864b183e90e1ee1503e24cc99ead504c67f147
2016-09-30 20:01:19 +00:00
Adam Seaton a6071948d8 Updating security string to 2016-11-05 on nyc-dev
am: 002132648d

Change-Id: I35cd90ba6f03e44b7a0197c557c5a348eb013620
2016-09-21 17:55:12 +00:00
Adam Seaton 7d01908b3b Updating Security String to 2016-11-01 on nyc-dev
am: 2a00b24144

Change-Id: Iaec891cdaecc040a815e89c3e33623b21e12100b
2016-09-21 17:51:41 +00:00
Adam Seaton 002132648d Updating security string to 2016-11-05 on nyc-dev
b/31618336

Change-Id: I1489eaf64c59dc0f175eb9220a900c68e262b3dd
2016-09-20 15:48:41 -07:00
Adam Seaton 2a00b24144 Updating Security String to 2016-11-01 on nyc-dev
b/31618336

Change-Id: I8ee8f978fbbf30efb1abca85cf374fc440a1baf7
2016-09-20 15:47:16 -07:00
Adam Seaton 89c03f5748 Update comments around PLATFORM_SECURITY_LEVEL (nyc-dev) Bug: 29881091
am: c63e4295ef

Change-Id: I9cb5cbb053ebb79b08a0d75bff21932bb8eaee33
2016-08-26 03:11:47 +00:00
Adam Seaton c63e4295ef Update comments around PLATFORM_SECURITY_LEVEL
(nyc-dev)
Bug: 29881091

Change-Id: I2bdaf7f796ab94b14416aaed6d68dc3a239ea5f9
2016-08-25 19:46:06 -07:00
Adam Seaton 6e4a224227 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88 am: 35e3465433
am: 68fede2142

Change-Id: I7c479cc20694085d70c6c6f6840e0ddc6f16fdc0
2016-08-18 23:05:25 +00:00
Adam Seaton 4249783848 Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44 am: 7d5d729831
am: 5d6ad4a9ab

Change-Id: I4e854f70d52f87cb809c59c6d73b4f5084bdba87
2016-08-18 23:05:24 +00:00
Adam Seaton 68fede2142 Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased) am: bb45bd20e9 am: eacfc7749b am: b93fd61d88
am: 35e3465433

Change-Id: Ie52eeb02bdfa1f17f3f584ec7fd03c274008037f
2016-08-18 22:14:18 +00:00
Adam Seaton eacfc7749b Update Security String to 2016-10-05 to Platform and CTS for October Security Updates (rebased)
am: bb45bd20e9

Change-Id: I72826f39c7c5db303106694fd41927e09f1c86d7
2016-08-18 22:04:24 +00:00
Adam Seaton 5d6ad4a9ab Update Security String to 2016-10-01 to platform and CTS for October Security am: cb60b2dedb am: e977aadfea am: 95e55dce44
am: 7d5d729831

Change-Id: Id24a8f9d8ae01587fd402839a41b6205efa4352e
2016-08-18 21:12:43 +00:00
Adam Seaton bb45bd20e9 Update Security String to 2016-10-05 to Platform and CTS for October
Security Updates (rebased)

b/30946906

Change-Id: Ia5207f919908496a593e3163788bfb75ce4e055d
2016-08-18 14:11:04 -07:00
Adam Seaton e977aadfea Update Security String to 2016-10-01 to platform and CTS for October Security
am: cb60b2dedb

Change-Id: Ibab3f4e47e05a2ec708105ddc3824df83ea95458
2016-08-18 21:01:43 +00:00
Adam Seaton cb60b2dedb Update Security String to 2016-10-01 to platform and CTS for October Security
Change-Id: I7ccdd54c1d269422c5e2e1f3e268fc539b6eb684
2016-08-18 17:39:31 +00:00
Ian Pedowitz 6dfac06e2c Merge "N-DR/N-MR1 is 7.1" into nyc-mr1-dev 2016-08-15 17:24:24 +00:00
Adam Seaton 831bee139d Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c am: 1f85078b1e
am: 782967785e

Change-Id: Ic5565af400aa3d3c245d5ab25d65a6244a46907d
2016-08-11 21:55:18 +00:00
Adam Seaton 782967785e Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ) am: fa721839b2 am: fdf4c8d8a6 am: 21b4d9e01c
am: 1f85078b1e

Change-Id: Id8709a33bf19fb106341a8aed5f2978adf91a7ef
2016-08-11 21:51:46 +00:00
Adam Seaton fdf4c8d8a6 Update Security String to 2016-09-06 to platform and CTS for September Security (+Quadrooter,-PZ)
am: fa721839b2

Change-Id: Iff74354f3540185eff4ae1b44600f5d00e1029cd
2016-08-11 21:41:45 +00:00
Adam Seaton fa721839b2 Update Security String to 2016-09-06 to platform and CTS for September
Security (+Quadrooter,-PZ)

Change-Id: I248efb2cbd877b4954994077df0f90adcf332f4a
2016-08-11 12:39:25 -07:00
Ian Pedowitz d0528b4463 N-DR/N-MR1 is 7.1
Bug: 30734691
Change-Id: I20a4e705ad972bbf24fb0aab65ab410c11496199
2016-08-09 16:44:23 -07:00
Adam Seaton 143faf4aa4 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5 am: f7de14b8a1
am: 2d033a9e51

Change-Id: Iacc3e198cff56bdd396a64e594d19e4ca635c3e4
2016-08-09 00:11:11 +00:00
Adam Seaton 2d033a9e51 Update Security String to 2016-09-07 to platform and CTS for September respin am: a53b868e6e am: e158db8ad2 am: 68870731a5
am: f7de14b8a1

Change-Id: I1412b8cee615535abe366b43ce4041efb4488bde
2016-08-09 00:05:36 +00:00
Adam Seaton e158db8ad2 Update Security String to 2016-09-07 to platform and CTS for September respin
am: a53b868e6e

Change-Id: I0655a62b517357f75022f902d26b44a5c8aeaf85
2016-08-08 23:48:10 +00:00
Adam Seaton a53b868e6e Update Security String to 2016-09-07 to platform and CTS for September
respin

Change-Id: I6ec8efad5b8e45bcf9df79fb54824acc92755a3b
2016-08-08 15:08:45 -07:00
Adam Seaton 8d4fac76b5 Fixed a comment: SECURITY_PATCH corrected to PLATFORM_SECURITY_PATCH
Change-Id: Id4eeaedac02900df7e635f378b54c2e58e9b5c6e
2016-07-29 11:52:35 -07:00
Adam Seaton bddec86ed9 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7 am: 8736caaba9
am: f25aadc812

Change-Id: I7172d0aef5029648ad1d7792eaa9e291ab41ec97
2016-07-28 22:34:12 +00:00
Adam Seaton f25aadc812 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev am: 525c6aa541 am: 63ec9d8f23 am: 04fe21c7b7
am: 8736caaba9

Change-Id: Id5b440e150d514e85ee28aab7830d1d94e8cc5b9
2016-07-28 22:31:08 +00:00
Adam Seaton 63ec9d8f23 Updating security string to 2016-09-05 to platform and CTS in preparation for 2016 September OTA on mnc-dev
am: 525c6aa541

Change-Id: I53403552530c0c449e3cd7f1afa59a9853712e88
2016-07-28 22:23:40 +00:00
Adam Seaton 525c6aa541 Updating security string to 2016-09-05 to platform and CTS in preparation
for 2016 September OTA on mnc-dev

b/30224278

Change-Id: I0f0591b7f0f033320de422c4019e056231228539
2016-07-28 21:21:06 +00:00
Zach Jang a212b9c250 Merge \\\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb am: bf8d3a2105
am: 37c17db1c6

Change-Id: Ia894b80e649552407714a685c2c33082204fb474
2016-07-21 15:27:58 +00:00
Zach Jang 37c17db1c6 Merge \\\\"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\\\\" into mnc-dev am: cb4ba4c90c am: 942c341ab1 am: 37688e09fb
am: bf8d3a2105

Change-Id: I92f956bcbd342f0fa953fed5ffb6d1462bbe3c4c
2016-07-21 15:21:00 +00:00
Zach Jang 942c341ab1 Merge \"Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA\" into mnc-dev
am: cb4ba4c90c

Change-Id: I7d4110e803b2775a4009c5adf1d249f98a2d0fa3
2016-07-20 18:14:48 +00:00
Zach Jang ee6b57f523 Updating security string to 2016-09-01 to platform and CTS in preparation for 2016 September OTA
b/30224278

Change-Id: I8032d58d2965fcf2c412a098cfa1d1e4c0add01d
2016-07-20 11:06:19 -07:00
Ian Pedowitz 14c2a1586b Merge "Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""" into nyc-mr1-dev 2016-07-06 18:46:24 +00:00
Ian Pedowitz 3b54683924 Revert "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""""
This reverts commit 266600b639.

Bug: 29117805
Change-Id: Idfc80ee1a91f76088c59a2ebe29a3d96bf02bf03
2016-07-05 18:25:14 +00:00
Michael Wright bcdc880ca9 N MR1 is API 25
Bug: 29816674
Change-Id: Iaaf6de5e99cf21b489afe677a8bf8b5385d9ca6e
2016-07-01 14:42:44 +01:00
Ian Pedowitz 47383ac698 Merge "Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""" into nyc-mr1-dev 2016-06-24 17:53:00 +00:00
Ian Pedowitz 266600b639 Revert "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES"""
This reverts commit 369efe3d84.

Bug: 29117805
Bug: 28809789
Bug: 29621988
Change-Id: Icd9e01d4cbd3f769237702f5df287eb61c7527cd
2016-06-24 17:52:29 +00:00
Ian Pedowitz 7b352c1d70 Merge "Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""" into nyc-mr1-dev 2016-06-23 22:00:24 +00:00
Ian Pedowitz 369efe3d84 Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
This reverts commit dc15ebc26c.

Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
2016-06-23 19:09:46 +00:00
Zach Jang 113239bed6 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524
am: 1f87a820ad

Change-Id: I7fa8b6b8fc732a24d3c058d02a5568abab52028b
2016-06-22 01:46:17 +00:00
Zach Jang 1f87a820ad resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db
am: 1be6c69524

Change-Id: If5d6ea4889550f45ef2a8f0ebf53a1e656c39010
2016-06-22 01:43:47 +00:00
Zach Jang 3749025ccb resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94
am: 9fc3cf7ba2

Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
2016-06-22 01:35:58 +00:00
Zach Jang 9fc3cf7ba2 resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
2016-06-22 01:33:23 +00:00
Zach Jang 0c672afc40 resolve merge conflicts of 12db224 to lmp-mr1-dev
Change-Id: I8ef3cd2c1d9eb2e4aefe3c678f0a6bb0fdf74c29
2016-06-21 18:23:46 -07:00