Commit Graph

4255 Commits

Author SHA1 Message Date
Alex Klyubin
cc3440cc1d Merge "Separate logic for alg selection for OTA and APK signing." 2016-05-03 20:50:54 +00:00
Amanda Kassay
40dd3e4964 Moving preview as a top level category so changing top category from develop to preview am: cb8ddc56e5 am: e11fd46903 am: cece14c2bc
am: ae10ab03ca

* commit 'ae10ab03caa712f511f7e31be61596e01b54257d':
  Moving preview as a top level category so changing top category from develop to preview

Change-Id: I9c90f789e62b743cdb52d09d026b412e5b3a27d9
2016-05-03 20:12:14 +00:00
Amanda Kassay
ae10ab03ca Moving preview as a top level category so changing top category from develop to preview am: cb8ddc56e5 am: e11fd46903
am: cece14c2bc

* commit 'cece14c2bc393bfe2deb99c3593e7c6424fd05d3':
  Moving preview as a top level category so changing top category from develop to preview

Change-Id: Ie68a233c418e93db7be4a9fc02cc0a1346aefcaf
2016-05-03 20:09:51 +00:00
Amanda Kassay
cece14c2bc Moving preview as a top level category so changing top category from develop to preview am: cb8ddc56e5
am: e11fd46903

* commit 'e11fd46903a2e450f15e469cf3ec4a17da22825f':
  Moving preview as a top level category so changing top category from develop to preview

Change-Id: I4f0b2af875bdc6eb93bfa568a735e7f63470a12b
2016-05-03 20:07:22 +00:00
Amanda Kassay
cb8ddc56e5 Moving preview as a top level category so changing top category from develop to preview
Change-Id: I30f97904f078b7730e12aece36343ed1a03c6cbe
2016-05-03 15:52:06 -04:00
Tao Bao
e094740249 releasetools: Change the base_fs assertion into warnings.
am: b079b50e2a

* commit 'b079b50e2ae2748f77139618cd5dfb8ef06d8418':
  releasetools: Change the base_fs assertion into warnings.

Change-Id: Iaa24f81e864886ef6f4ebe05ea514fa977306fb4
2016-05-03 16:59:17 +00: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
smain@google.com
018351489e resolve merge conflicts of bfa0fff to nyc-dev
am: 788f98ae22

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

Change-Id: I14676cacd30bbcbaae3a9aec1a9798e5aed6a27e
2016-05-02 22:45:21 +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
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
Shinichiro Hamaji
6e92d40a72 Merge "Initialize an uninitialized field in ijar" am: a6da20e2d2
am: c6a3413fa7

* commit 'c6a3413fa78f71de68d8fed2157ddad28d6478fa':
  Initialize an uninitialized field in ijar

Change-Id: I039a3c4b1ccb7439af698e3c3e88a043844a6b39
2016-05-02 19:15:01 +00:00
Shinichiro Hamaji
a6da20e2d2 Merge "Initialize an uninitialized field in ijar" 2016-05-02 19:00:43 +00:00
Chih-hung Hsieh
62ee02f772 Merge "Fix google-explicit-constructor warnings." am: 169cb4b68c
am: 6b63c3b696

* commit '6b63c3b6968a4ca3e4d055b69a67b74082d79e99':
  Fix google-explicit-constructor warnings.

Change-Id: I297982955eafe459a1f9c96b6b401e16aff0fd04
2016-05-02 18:31:42 +00:00
Shinichiro Hamaji
d6c694b302 Initialize an uninitialized field in ijar
The upstream patch was merged:
https://github.com/bazelbuild/bazel/commit/a5004430338bc72817c7

Bug: 28347190
Change-Id: I9b8b9bc830bd16299b94e8c92c22dba8aa36affb
2016-05-03 03:19:23 +09:00
Chih-hung Hsieh
169cb4b68c Merge "Fix google-explicit-constructor warnings." 2016-05-02 18:08:16 +00:00
Tao Bao
be9457cad2 Pack base_fs files into target_files.zip.
am: f54216f292

* commit 'f54216f29238a67aad1199a0e85d09e443740bf0':
  Pack base_fs files into target_files.zip.

Change-Id: Ia68c3a707def1865151f071ca33a3bdc513f9045
2016-05-02 16:45:31 +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
Elliot Waite
ec65dc30f6 Merge "Generate reference nav to _book.yaml for devsite builds." into mnc-mr-docs am: dc55c97296 am: 16c30a64a6 am: f1929d419b
am: 5eee82cf1c

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

Change-Id: Ic3010dd85ec09f47f1a0e9f7d76c7c3b70f70ac3
2016-04-29 23:56:23 +00: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
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
Chih-Hung Hsieh
1df33b78aa Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d
2016-04-29 14:10:10 -07:00
Alex Klyubin
2a10307455 Merge "zipalign supports -p also when checking alignment." am: 401f8b953f
am: b6587f9895

* commit 'b6587f9895e61751e9a85faa3ab7ace753dcf07e':
  zipalign supports -p also when checking alignment.

Change-Id: I11207ce34a3f2d3a5c55df4ac67c92c7032e5b68
2016-04-29 20:35:07 +00:00
Alex Klyubin
01d6b59dcf zipalign supports -p also when checking alignment.
This updates the usage banner of zipalign to state that the -p switch
is supported in check alignment mode.

Change-Id: I119026b0e09e5a2528646e88a9b58dbb79c0c17c
2016-04-29 12:32:17 -07:00
Amanda Kassay
21291ad01b Merge "Adding top category, subcategory and book path detection for go/libraries" into mnc-mr-docs am: 5b005e1ded am: e0b5cb8f29 am: 532e0accaa
am: aa63361bde

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

Change-Id: I019a07b0127f74fc4dde069092a18112eb2a0fa5
2016-04-29 19:00:59 +00: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
smain@google.com
6de605ad49 add studio survey button to header. am: f887aec708 am: cc81c16143 am: ec1a297d39
am: 16f9ebf7c5

* commit '16f9ebf7c599b2d532a44c5c6b83490d7b15a6a8':
  add studio survey button to header.

Change-Id: Id81635bcdb37131026dde995be9abdb18e17a55a
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
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
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
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
Amanda Kassay
5a42072481 Dac-on-DevSite: Update to fix issue with sample project pages double breadcrumb and header. b/27923494 am: 76074b1 am: c24b430 am: 74ca66c
am: 2761f65

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

Change-Id: Iaee41fb27cf7d0fd3e9f6d20c0c59ec05ee822c9
2016-04-26 22:52:23 +00: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
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
Dirk Dougherty
20d1339d13 Update samples_navtree cs template to include generated _yaml from samples TOC. am: 1a2dbb6 am: 0781792 am: 88db402
am: 488c67f

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

Change-Id: I03e3f507cccbd9d781ff92e54681ed82fc13cad2
2016-04-26 17:04:45 +00:00
smain@google.com
76b5eb2c53 remove version number from download button at bottom of page. am: ba761ab am: fbbd3fa am: ce735df
am: 635983e

* commit '635983e5cef8b1893f5e93a1c9e5ece7964b9a71':
  remove version number from download button at bottom of page.

Change-Id: I8707402b4f341a92c4aa226e66e88556edfb6879
2016-04-26 17:04:44 +00:00
Amanda Kassay
af83fe3b64 Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html am: 01febb9 am: 9ba538e am: 6e66602
am: bfe8888

* commit 'bfe8888855b886e9fece5d9f6fc2a7fee04b08a2':
  Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html

Change-Id: I6b7547d45e7143479d16204c039a4afdf899f1fa
2016-04-26 17:04:44 +00:00
Scott Main
81713139a5 Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs am: 848295a am: 7013662 am: f11a849
am: ab57a86

* commit 'ab57a860327f5e8377d327ac910a114c55c6c8ab':
  Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"

Change-Id: I5b62b050cf6d23758fd4ca0d2f549feaa89a8630
2016-04-26 17:04:43 +00:00
Amanda Kassay
dfd5c02034 Added html escape for search queries to fix XSS issue b/28135307 am: 2bb3328 am: b32745e am: 06abbd3
am: 2f57a4a

* commit '2f57a4a25e76c71957123873d7e21b7b8e6e7efa':
  Added html escape for search queries to fix XSS issue b/28135307

Change-Id: I5b75cbda7fb8f5d135b8514ba02a4efe9289a5b0
2016-04-26 17:04:42 +00: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
smain@google.com
635983e5ce remove version number from download button at bottom of page. am: ba761ab am: fbbd3fa
am: ce735df

* commit 'ce735dfad2de7598a5f9b76eb50bf0a1d11a94e5':
  remove version number from download button at bottom of page.

Change-Id: I55268cba0d6b96018518f36781ffb32ab9b8aa67
2016-04-26 17:01:45 +00:00
Amanda Kassay
bfe8888855 Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html am: 01febb9 am: 9ba538e
am: 6e66602

* commit '6e666024449fa937ddbe9b77e082c51c78f1f304':
  Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html

Change-Id: I0ce30c2fe5a34b8d6ca7bf4a2aa0d7cf6fdfe391
2016-04-26 17:01:45 +00:00
smain@google.com
ab57a86032 Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs am: 848295a am: 7013662
am: f11a849

* commit 'f11a8493fd6fd8233312bf51daa94b1929a483a4':
  Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"

Change-Id: Idd3454b13d41434a4ea0127b33c184af41637be0
2016-04-26 17:01:44 +00:00
Amanda Kassay
2f57a4a25e Added html escape for search queries to fix XSS issue b/28135307 am: 2bb3328 am: b32745e
am: 06abbd3

* commit '06abbd3140f04dc5a08b57ca40c15628ae308ec3':
  Added html escape for search queries to fix XSS issue b/28135307

Change-Id: I6a594b9cf4bd07b498033521c532db726edad69c
2016-04-26 17:01:43 +00:00
smain@google.com
382e60f16c resolve merge conflicts of 0e7d143 to nyc-dev
am: 089e4bb

* commit '089e4bbcf508020524b89f8c732b41768d4ea969':
  change order of windows downloads

Change-Id: Idc9ead41fb6e6bc907646bf655f767894d5760d2
2016-04-26 17:01:42 +00:00