Commit Graph

3689 Commits

Author SHA1 Message Date
Trevor Johns bf234fdfba Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
2016-04-12 10:35:42 -07:00
Trevor Johns f719c29ea9 Resolve merge conflicts of a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
2016-04-11 14:55:35 -07:00
Dan Willemsen 23f326a67d Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
2016-04-11 11:21:47 -07:00
Mohamad Ayyash 8837882fb9 Use fs_config files for mksquashfs
BUG: 27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:10:51 -07:00
Trevor Johns a5f006873c Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	tools/droiddoc/templates-sdk/assets/css/default.css
	tools/droiddoc/templates-sdk/sdkpage.cs

Issue: 28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
2016-04-05 20:32:32 -07:00
Amanda Kassay ebcf3977a2 Tabs js error fix, DevSite css issues fix, Search filtering
Staged: http://akassay.nyc.corp.google.com:8080/index.html#q=Activity
Change-Id: Id25525a8d8c927ea67cd13b43652d75ce53733cf
2016-04-05 20:46:13 +00:00
smain@google.com 190e610df3 new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116
2016-04-05 11:13:12 -07:00
smain@google.com 7281802438 tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
2016-04-04 16:17:01 -07:00
Dirk Dougherty c607a4d4d5 Update modal download dialogs for sdk/ndk download.
Revise the redirect behavior once download completes.
Add more appropriate title and download message when installing SDK tools only.
Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state.
Add styles for the Studio download page.

Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
2016-04-04 12:45:04 -07:00
Dirk Dougherty 0d268bea3c increment version for fetched js and cs files to avoid proxy caching.
Change-Id: I427151284bf6777adb04e85b07b9b70355f8f7a2
2016-03-31 15:59:09 -07:00
Amanda Kassay 843649bab1 Migrating web search api to custom search api on templates-sdk
akassay.nyc.corp.google.com:9000/#q=mobile
Change-Id: I71bdc7dbfede7bff0361ce00abef8081b852dd36
2016-03-31 16:40:35 +00:00
smain@google.com 38b0e22049 new search results layout.
no more custom suggestions; just API matches and organic results.

Change-Id: I6324aa6fb289f5d93aa701aecbd7fad64711d35f
2016-03-30 14:27:29 -07:00
smain@google.com 1c8d4a49e9 remove dev guide search suggestions, move organic search results up.
tweak the search suggest for reference pages

Change-Id: I14e48fdac3f103dd998591886b91e5f6040b0f7a
2016-03-30 14:27:12 -07:00
Amanda Kassay e4a8ab1a44 Adding book metadata to doc head, fix tabs for content build,
fix for reference page double footer.

Change-Id: I8e721c60e21203b599779e31f48336d450a53fa3
2016-03-29 21:10:56 +00:00
Alex Klyubin 284e45ac09 Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.

Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.

Bug: 27814973

(cherry picked from commit 37a0ecd329)

Change-Id: If2e0df6d3298e9736ef175bb0d9a05d450164c9f
2016-03-23 18:11:35 -07:00
smain@google.com 6405ed9d51 remove the 'refonly' templates.
no longer needed, as the standard templates now have conditions to handle the reference only design.
bug: 27667787

Change-Id: I7c627ad4cace0bb1c77c494b3052eca3c9609a5c
2016-03-22 16:00:34 -07:00
smain@google.com 3d048cdc25 increment docs.js version to force browser refresh.
needed to load recent fixes to the zippies.

Change-Id: Ifd14b99ea004b674f15558dc86371901adbe2375
2016-03-22 15:57:16 -07:00
smain@google.com 9a12a2f82f add the 'reference only' header design as a condition to the normal templates.
also add override for implementation to the to-root link path.
bug: 27667787

Change-Id: I79892ddb7c5053d5325afcd50016c726b34e1361
2016-03-22 14:31:39 -07:00
smain@google.com c040187f63 update zippy icons to use material arrow (up/down instead of right/down).
fixes bug 27695580, which was caused because I previously
submitted an update to the code doclava templates to do this but
did not update the current site templates in kind.

Change-Id: I33a4ef90359838c02def90beb486e5a2dc21cbf7
2016-03-16 11:48:23 -07:00
Sami Tolvanen a8c37be285 Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit 494a9090f9.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit 3303d909a1)
2016-03-15 11:23:56 -07:00
Alex Klyubin 914b37f4e3 Fix two cosmetic issues in signapk.
* Zip EoCD record comment length was referred to as 32-bit whereas it
  is a 16-bit field. The implementation was fine, but the comment and
  the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
  Removed.

Bug: 25794543

(cherry picked from commit 82bf99bb4e)

Change-Id: I9845b5fa096859d67b306f4b9b6c205cad622c0c
2016-03-14 15:13:30 -07:00
Sami Tolvanen b3038bedcd Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev 2016-03-14 15:49:15 +00:00
Sami Tolvanen 1bca9fb6d4 Revert "build: pass version and patch level to mkbootimg"
This reverts commit e555f77962.

Bug: 27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb
2016-03-14 15:47:11 +00:00
Scott Main e6e3c70b67 Merge "change printed version in offline docs to check whether in preview or not, and change the title accordingly, using new preview codename or version number." into nyc-dev 2016-03-10 23:12:44 +00:00
smain@google.com 0d7e38042d make image resource URLs relative so they work in offline docs
Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
(cherry picked from commit 7d959be058)
2016-03-10 23:10:15 +00:00
smain@google.com 0e3342ff81 change printed version in offline docs to check whether in preview or not,
and change the title accordingly, using new preview codename or version number.

Change-Id: I2833dcd05447add10495fea2149b5a9678831235
2016-03-10 15:04:40 -08:00
smain@google.com 5e37eef425 change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).

Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
(cherry picked from commit 06bdd78284)
2016-03-10 18:06:25 +00:00
David Friedman 2f52adb1c8 Merge "Docs: Change MD5 to SHA1 in NDK download table column heading" into mnc-mr-docs 2016-03-10 01:59:03 +00:00
David Friedman 5f2abfce98 Docs: Change MD5 to SHA1 in NDK download table column heading
Change-Id: I0b70c86de855d609b45378c18dfb83830b944a28
2016-03-09 17:58:08 -08:00
smain@google.com 06bdd78284 change name of offline doc tab to "API reference"
and put the version number in the secondary nav bar (it was there anyway).

Change-Id: I4b49581eca6afa445a434cd6ae31572d01f276ef
2016-03-09 15:56:20 -08:00
Dirk Dougherty 49a5668d6f Fix broken suggestions for preview.
Change-Id: I1a13a3a9d9e38470ac040a37cdd04319bd6340e6
2016-03-09 14:36:34 -08:00
Mohamad Ayyash 6a3185f23d Merge "Hook incremental ext4 image generation into build" into nyc-dev 2016-03-09 20:56:19 +00:00
Scott Main 8866b1a45e Merge "Revert "Search for suggestion matches across PREVIEW_RESOURCES."" into mnc-mr-docs 2016-03-09 20:42:54 +00:00
Scott Main 519da3e6b3 Revert "Search for suggestion matches across PREVIEW_RESOURCES."
This broke search suggestions.

This reverts commit 882adaed0e.

Change-Id: I830339887955dfe86d502e54860d90ce59394d69
2016-03-09 20:42:29 +00:00
David Friedman 3c5e9c98c3 Merge "Docs: Updates NDK download table for NDKr11" into mnc-mr-docs 2016-03-09 20:35:59 +00:00
David Friedman d0f655c818 Docs: Updates NDK download table for NDKr11
Bug: 27167382
Change-Id: I11ef906f81c8a6e4951559952d4eeb383e7bf911
2016-03-09 12:31:17 -08:00
smain@google.com 7d959be058 make image resource URLs relative so they work in offline docs
Change-Id: I4329689d8a3db3ce67f1aa7084a3a4634721e3cb
2016-03-09 11:57:39 -08:00
Joe Fernandez f539ae51e3 docs: Update DAC template to force refresh of resources
- incremented js and css resource references to =v18
b/2753523

Change-Id: I43335732227662fea21c655a3ca67054bd828fe5
2016-03-09 00:08:17 -08:00
Tao Bao 00ed831a11 resolve merge conflicts of 2ad8b97577 to nyc-dev
Change-Id: Ifa7501e58dd25e73ed760b1383a1873e4d449885
2016-03-08 21:39:13 -08:00
Tao Bao 7302eb7dd6 Use the update-binary in the source build for downgrade OTAs.
am: fa41fb2705

* commit 'fa41fb27054185b3fba0519d01dabd21444fe772':
  Use the update-binary in the source build for downgrade OTAs.
2016-03-09 05:27:36 +00:00
Tao Bao ff75c23086 releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.

Bug: 27556903
Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
(cherry picked from commit dca2200c8a)
2016-03-08 19:01:26 -08:00
Tao Bao fa41fb2705 Use the update-binary in the source build for downgrade OTAs.
We used to use the update-binary from the target build when creating
incremental OTAs. But for downgrade OTAs, we should use the one in the
source build instead, which is actually newer.

Bug: 27556903
Change-Id: Ib6415729b979dbffdebdda24902f7f560942801a
(cherry picked from commit 4996cf03d2)
2016-03-08 18:48:40 -08:00
smain@google.com b8b72c14e5 Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.

Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
(cherry picked from commit 5fea5df99c)
2016-03-08 21:31:20 +00:00
Sami Tolvanen e555f77962 build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
(cherry pick from commit 8fb47f191f)
2016-03-08 08:21:52 -08:00
Tao Bao 84bc4b78cc resolve merge conflicts of 08a3a32fa9 to nyc-dev
Change-Id: I6fd55b3d2bd0c396018163dd4f54970cb55432cd
2016-03-07 21:49:33 -08:00
Tao Bao bd25fcdc02 resolve merge conflicts of 177c610e7f to cw-e-dev
Change-Id: Iba7820247d0b53d7f9553290eb0db3547f31beda
2016-03-07 21:24:40 -08:00
Tao Bao 177c610e7f DO NOT MERGE releasetools: Support generating downgrade incremental OTAs.
Add --downgrade flag to ota_from_target_files.py script. It allows
generating an incremental OTA that updates from a newer build to an
older one (based on timestamp comparison). "post-timestamp" line in the
metadata file will be replaced by "ota-downgrade=yes". A data wipe will
always be enforced, so "ota-wipe=yes" will also be included in the
metadata file.

Bug: 26883782
Change-Id: Iaa05f662d948b7ab632a9fbb7051cc3f8bf68c21
(cherry picked from commit 5d1825664a)
2016-03-07 21:02:36 -08:00
Scott Main 6bc6afbf3a Merge "Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header." into mnc-mr-docs 2016-03-08 02:49:10 +00:00
smain@google.com 5fea5df99c Add new templates directory for "reference only" builds.
The only difference is that this changes the masthead.cs file to show a different header.

Change-Id: Id58eb7e8c42a8ab0886f2f5da794fcd108f299ff
2016-03-07 18:43:21 -08:00
Dirk Dougherty ef0e3eaa14 Add styles to compress the summary table presentation.
Change-Id: Icbb5da4c87bc111bfe7c5d29af4ad53546f11114
2016-03-04 18:46:54 -08:00