Commit Graph

9634 Commits

Author SHA1 Message Date
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
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 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
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
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 ea3b024d7d Updating security string to 2016-07-05
b/28912173

Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
2016-05-25 12:38:46 -07: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 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 45ff24a04b Updating security string to 2016-07-01
b/28912173

Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
2016-05-23 13:26:32 -07: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 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
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 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
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
Baligh Uddin f193546d65 DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev
Bug: 23967152
Change-Id: I2e2f1ead28f51f549dafacfc7d1d1e65b0b84bc7
2016-05-12 15:55:26 -07:00
Ian Pedowitz 8313541c65 PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Bug: 27150977
Change-Id: I0958ee2cc377c5640c616dab8f093323ffd76c29
2016-05-12 10:39:59 -07:00
Baligh Uddin 16690162c3 DO NOT MERGE ANYWHERE - Add verifiedboot keys to otatoools.zip.
This is needed for nemo* signing off emerald-dev.

Bug: 28726512
2016-05-11 16:32:17 -07:00
Alex Klyubin f59ad14c1f Fix handling of version codes in minSdkVersion when signing.
The APK signing tool, build/tools/signapk, needs to know the API Level
of the oldest platform supported by the APK. The APK's minSdkVersion
may reference that using a number (API Level) or a version code. To
handle the version code case, the existing logic was to see if it
matches $PLATFORM_VERSION_CODENAME and then substitute it with
$PLATFORM_SDK_VERSION.

However, some platforms support multiple version codes. To handle this
scenario, this commit changes the logic for computing the min API
Level for signing purposes to treat any non-numeric minSdkVersion as
$PLATFORM_SDK_VERSION.

Bug: 28715556
Change-Id: I292c96e8928b7e2f8d9716ef2be33a23a87764c4
2016-05-11 12:11:11 -07:00
Nicholas Sauer 40ef6697be Merge "Add org.apache.harmony.tests.javax.xml to old cts" into nyc-dev 2016-05-11 14:35:15 +00:00
Nicholas Sauer 088230cb34 Add org.apache.harmony.tests.javax.xml to old cts
bug: 28556024
Change-Id: I7903ce93f27aef55f55acc9231e631d11a463f1b
2016-05-10 12:54:32 -07:00
Andreas Gampe a20910f495 Build: Switch on oat file mini-debug-info for boot.oat
Enable mini-debug-info for the boot image by default. This
can be disabled with WITH_DEXPREOPT_DEBUG_INFO=false.

Bug: 28474219

(cherry picked from commit 58f6bfaa37)

Change-Id: Ifd59d854f01ad8cf703f16d7a6e88c2c82d47feb
2016-05-09 22:42:27 +00:00
Tao Bao f54216f292 Pack base_fs files into target_files.zip.
Pack the base_fs files ({system,vendor}.map) into target_files.zip,
which would be needed when rebuilding the images at signing.

Reset the base_fs paths to point to the files in META/.

Also add blk_alloc_to_base_fs into otatools.zip.

Bug: 27698960
Change-Id: If4eb274b3f3d839c4365624f46f0dc89bd2fa440
2016-04-30 23:56:10 -07:00
Adam Lesinski dfd6197f51 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-29 22:09:01 +00:00
Todd Kennedy 1ccfe52630 Merge "Only align when necessary" into nyc-dev 2016-04-29 20:59:04 +00:00
Todd Kennedy 3f18099610 Only align when necessary
Bug: 27887819
Change-Id: Ie8b5ca31cc1c08943588fc6039d75190ff7eeb8b
2016-04-29 13:58:13 -07:00
Adam Lesinski 8d1e2fdcba Call aapt2 link with argument-list
Also follow symbolic links when looking for assets.

Bug:22775504
Change-Id: I971e23505f766a2192469df1aad55bc20c46f618
2016-04-28 15:10:18 -07:00
Adam Lesinski 6c078e0522 Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev 2016-04-28 20:10:17 +00:00
Adam Lesinski 4c44d94999 Revert "Call aapt2 link with argument-list"
This reverts commit d4d6a50fbb.

Change-Id: If84ad9921eb51ae16eae2be3cf4b2ee86b31ce80
2016-04-28 20:06:53 +00:00
Adam Lesinski 0e57d3afc1 Merge "Call aapt2 link with argument-list" into nyc-dev 2016-04-28 19:34:32 +00:00