Commit Graph

28389 Commits

Author SHA1 Message Date
Todd Kennedy 98ffa937bf Revert "Revert "Add shim app for CTS testing""
This reverts commit 31003c48c1.

Bug: 28398205
Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8
2016-05-03 11:16:35 -07:00
Tao Bao b079b50e2a releasetools: Change the base_fs assertion into warnings.
commit f54216f292 packed the base_fs files
into target_files.zip and added assertion to ensure the existence of the
files. We don't want to fail the OTA generation for the target_files.zip
without the base_fs files. Change the assertion into warnings instead.

Bug: 28547368
Change-Id: I6fd758a0a4fdfff02d1640fa46cf43d971627e26
2016-05-03 08:05:09 -07:00
Todd Kennedy 878775fd75 Merge "Revert "Add shim app for CTS testing"" into nyc-dev 2016-05-02 23:56:37 +00:00
Todd Kennedy 31003c48c1 Revert "Add shim app for CTS testing"
Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".

This reverts commit d987a11126.

Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
2016-05-02 23:54:08 +00:00
Todd Kennedy 6d0c367a64 Merge "Add shim app for CTS testing" into nyc-dev 2016-05-02 22:49:55 +00:00
smain@google.com 788f98ae22 resolve merge conflicts of bfa0fff to nyc-dev
Change-Id: Ibcb549cbb578bb1aa2347a63df0420d65272586e
2016-05-02 15:30:44 -07:00
smain@google.com bfa0fffc9f remove the sdk download tables. No longer used now that downloads are in the /studio docs. am: 6f0ed9bddd
am: 56c09c5e6e

* commit '56c09c5e6e9095c9a7b3e4387a81ce1fd2ea1145':
  remove the sdk download tables. No longer used now that downloads are in the /studio docs.

Change-Id: I362d830a6ecbe48e99cd0cf77d6d52136fa15a94
2016-05-02 21:41:35 +00:00
smain@google.com 56c09c5e6e remove the sdk download tables. No longer used now that downloads are in the /studio docs.
am: 6f0ed9bddd

* commit '6f0ed9bddd6457b358f662a2d1657686f633f903':
  remove the sdk download tables. No longer used now that downloads are in the /studio docs.

Change-Id: I64df6648f49943177192ea7cd27139b9b21d29ea
2016-05-02 21:36:38 +00:00
smain@google.com 6f0ed9bddd remove the sdk download tables. No longer used now that downloads are in the /studio docs.
Change-Id: I19524f58c2bcbfc5abdc79c60b16a259b526801b
2016-05-02 14:19:17 -07:00
TreeHugger Robot 386df80e85 Merge "Added bugreportz binary." into nyc-dev 2016-05-02 19:54:50 +00:00
Felipe Leme 90ab323be2 Added bugreportz binary.
BUG: 28479946
Change-Id: Ic0d1b6598867ccbbc65f3fdc0d32cac7c53128a3
2016-05-02 11:18:07 -07: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
Dirk Dougherty 5eee82cf1c Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296 am: 16c30a64a6
am: f1929d419b

* commit 'f1929d419b5ac003d50e4a2efc18bbeadf81245b':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: Ifda2c3062588bfb8205e59dfcc3d909a62334ddc
2016-04-29 23:54:12 +00:00
Elliot Waite f1929d419b Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296
am: 16c30a64a6

* commit '16c30a64a66aa141822df3d77277050cf4271524':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: I905d220aef6137863a16556ed24fbf6d14788f7d
2016-04-29 23:52:00 +00:00
Dirk Dougherty 16c30a64a6 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs
am: dc55c97296

* commit 'dc55c97296b0cc7d50d56013d417444c9b012ce2':
  Generate reference nav to _book.yaml for devsite builds.

Change-Id: Id90b7d082e780530943f2a9e25f42edbc634658d
2016-04-29 23:49:43 +00:00
Elliot Waite dc55c97296 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs 2016-04-29 23:42:15 +00:00
Dirk Dougherty ba8230849d Generate reference nav to _book.yaml for devsite builds.
Change-Id: Iea0e1031b0d757664b8994096010dd92b98ca883
2016-04-29 16:25:21 -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
Amanda Kassay aa63361bde Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded am: e0b5cb8f29
am: 532e0accaa

* commit '532e0accaa91468550ce0ddc375629618e8873c2':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: I1264c52ce1a3329ee54565ba14a412144d229647
2016-04-29 18:58:40 +00:00
Amanda Kassay 532e0accaa Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded
am: e0b5cb8f29

* commit 'e0b5cb8f297c24a58382baa41d006783c61afd35':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: I2132c0e0e52a0659874e495ac852e037ada17036
2016-04-29 18:56:25 +00:00
Amanda Kassay e0b5cb8f29 Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs
am: 5b005e1ded

* commit '5b005e1ded3a7c857fa326811e4cc197f394dab3':
  Adding top category, subcategory and book path detection for go/libraries

Change-Id: Id9274c4d464a42f54f5e6c53ede396e7060e773e
2016-04-29 18:54:12 +00:00
Amanda Kassay 5b005e1ded Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs 2016-04-29 18:44:25 +00:00
smain@google.com eeb1c898b9 add studio survey button to header. am: 075aad742a am: 1e5a77656d am: 5b21ac836b
am: 0fbdef286c

* commit '0fbdef286c3d75c46f6cfe8222a02f23fe71eada':
  add studio survey button to header.

Change-Id: I0c30340254f078958a4d87a4a6368673fb8978d2
2016-04-29 16:40:05 +00:00
Amanda Kassay c6d9cdce8d Adding top category, subcategory and book path detection for go/libraries
Fix for sdk download form b/28425669

Fix for missing 'Develop' text in left nav on preview pages b/28450858

Change-Id: I0b7a5dc26dc3cb4be58aecbbad41cdf62e0331ba
2016-04-29 16:38:37 +00:00
smain@google.com 16f9ebf7c5 add studio survey button to header. am: f887aec708 am: cc81c16143
am: ec1a297d39

* commit 'ec1a297d39ee983dd82353ffc53428eb6da09f0c':
  add studio survey button to header.

Change-Id: I4608a02f570358c8efaec0568517f1923f59e65e
2016-04-29 16:37:24 +00:00
smain@google.com 0fbdef286c add studio survey button to header. am: 075aad742a am: 1e5a77656d
am: 5b21ac836b

* commit '5b21ac836b99141e460b5426c8781dddc9987439':
  add studio survey button to header.

Change-Id: Iaff1610a9fdc0eb64cabb09bd151a81896d2e065
2016-04-29 16:37:23 +00:00
smain@google.com 5b21ac836b add studio survey button to header. am: 075aad742a
am: 1e5a77656d

* commit '1e5a77656d6edc39f5cc61e118edd78a0c99b1d8':
  add studio survey button to header.

Change-Id: I5deb51962a013dbc895c87a64be2f2c7c0a9ca4e
2016-04-29 16:34:58 +00:00
smain@google.com ec1a297d39 add studio survey button to header. am: f887aec708
am: cc81c16143

* commit 'cc81c161431ac0bdbd460dd0ed4a56dce2a4c2b3':
  add studio survey button to header.

Change-Id: Idd83cccf03d06223a625e3ae9bf66eb39c9dfd66
2016-04-29 16:34:58 +00:00
smain@google.com 1e5a77656d add studio survey button to header.
am: 075aad742a

* commit '075aad742a9d12d43435e7b909a6a999c1050f6c':
  add studio survey button to header.

Change-Id: I82c20a411335126acfcca8773aab51eb142b213d
2016-04-29 16:32:31 +00:00
smain@google.com cc81c16143 add studio survey button to header.
am: f887aec708

* commit 'f887aec708426ca4f6dbb1def25b006813979e42':
  add studio survey button to header.

Change-Id: I7b674d935116978bcd6a1c0b11ad5f54bd950f74
2016-04-29 16:32:31 +00:00
smain@google.com 075aad742a add studio survey button to header.
adds JS to save in local storage whether the user already clicked the
survey. The button appears only if they have not clicked it yet.

Change-Id: Ifc5a100a8bb8505c47d95c7cfb5aaa8cdbfdc8bd
(cherry picked from commit f887aec708)
2016-04-29 16:28:40 +00:00
Todd Kennedy d987a11126 Add shim app for CTS testing
We need a shim application on the system partition that we can upgrade
during CTS tests.

Bug: 27450489
Change-Id: I32a72dc5110cedd466cdee2607965c705f7aa6d3
2016-04-29 07:31:31 -07:00
smain@google.com f887aec708 add studio survey button to header.
adds JS to save in local storage whether the user already clicked the
survey. The button appears only if they have not clicked it yet.

Change-Id: Ifc5a100a8bb8505c47d95c7cfb5aaa8cdbfdc8bd
2016-04-28 17:34:41 -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
TreeHugger Robot 2c7fd2d170 Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev 2016-04-28 05:07:55 +00:00
Mohamad Ayyash b88afd7aca Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev 2016-04-27 21:15:05 +00:00
Baligh Uddin 76cba16805 ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1 am: f3b80ae -s ours am: d7aa910 -s ours am: 7f53910 -s ours
am: bc0c779  -s ours

* commit 'bc0c779d32e30dac03cffc4be5b3af561118dd69':
  ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1

Change-Id: Ib11ce5b28c4cc6543f711dc78d733720cf71ffb7
2016-04-27 20:34:08 +00:00
Igor Murashkin 2806d99938 Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev 2016-04-27 18:45:47 +00:00
Igor Murashkin 5ec15a52b1 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
2016-04-26 17:47:45 -07:00
Amanda Kassay 2761f65c55 Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494 am: 76074b1 am: c24b430
am: 74ca66c

* commit '74ca66c63960903eb2bb65d6db8c6f5a0675dc43':
  Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494

Change-Id: I7a70043bfe207479b0e23f5c146da65ef8fd0ba1
2016-04-26 22:24:05 +00:00
Amanda Kassay 74ca66c639 Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494 am: 76074b1
am: c24b430

* commit 'c24b4307af594a73bb5e303ebf16b0a0821ba024':
  Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494

Change-Id: I2018ed5aca9df4b1284e8cd52228e15304e01048
2016-04-26 21:26:28 +00:00
Amanda Kassay c24b4307af Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494
am: 76074b1

* commit '76074b1c0032b0a4de222ad3f38754fb3413c0a7':
  Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494

Change-Id: I349b08c28b68ef6c83da1ba32a1518ad60ccabab
2016-04-26 21:22:16 +00:00
Amanda Kassay 76074b1c00 Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494
Change-Id: I575a7f425277ede320c1fa457770af1fe29d3583
2016-04-26 16:56:37 -04:00
Adam Lesinski d4d6a50fbb Call aapt2 link with argument-list
Also follow symbolic links when looking for assets.

Bug:22775504

Change-Id: I78b4e2b7d7750dfecafd64e29cf0e19dff851155
2016-04-26 13:32:01 -07:00
Dirk Dougherty 488c67f121 Update samples_navtree cs template to include generated _yaml from samples TOC. am: 1a2dbb6 am: 0781792
am: 88db402

* commit '88db402e162a6f22d133aefb8845ef4e2924d9f8':
  Update samples_navtree cs template to include generated _yaml from samples TOC.

Change-Id: I116cc4df9e681dd7d542b14666ed5a67729bb021
2016-04-26 17:01:46 +00:00