Ying Wang
3fbc1c655c
Merge "Fix compilation warning."
...
am: 5af0991
* commit '5af0991bfce1695818c76ef3db2c36cc609f4980':
Fix compilation warning.
2016-03-17 22:55:45 +00:00
Ying Wang
5af0991bfc
Merge "Fix compilation warning."
2016-03-17 22:44:29 +00:00
Ying Wang
0c38bc5762
Fix compilation warning.
...
Fix compilation warning:
" destination for this 'memcpy' call is a pointer to dynamic class
'CentralDirEntry'; vtable pointer will be overwritten"
by removing unnecessary virtual desctructor.
Bug: 27695718
Change-Id: Id3c451f82374f2232176115b7bc3291ac4275c00
2016-03-17 14:48:16 -07:00
Chih-Hung Hsieh
332962c4d2
Merge "Classify more warning patterns."
...
am: b569c06
* commit 'b569c060360109d9450ea269fe7b2a85bcf3fc17':
Classify more warning patterns.
2016-03-17 16:08:07 +00:00
Chih-hung Hsieh
b569c06036
Merge "Classify more warning patterns."
2016-03-17 16:01:27 +00:00
Chih-Hung Hsieh
f8aaf60ceb
Classify more warning patterns.
...
Some warnings are from clang static analyzer
and they do not have compiler -W flag.
BUG: 27698849
Change-Id: I3d1fc9c2d6c60100e87f8ea201d3f8314370fccd
2016-03-16 15:15:40 -07:00
Tao Bao
384dbd939c
Merge "Revert "Revert "releasetools: Support OTAs that have OEM properties changes."""
...
am: fd52990
* commit 'fd529902f8731b028fac38b0c31a2c6d170c2726':
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
2016-03-16 19:21:49 +00: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
Tao Bao
3e30d97dde
Revert "Revert "releasetools: Support OTAs that have OEM properties changes.""
...
This CL fixes the bug in [1] (copy-paste error) and reenables it.
We need to handle a special case that an OTA goes from a source build
without OEM properties to a target build with those properties (or vice
versa). Add support in OTA scripts to deal the case properly, by a)
using two oem_props variables to handle source and target builds
respectively; b) adjusting the fingerprint/thumbprint assertions to
allow a mix of both.
[1] commit c086370440
Change-Id: I98118d77d5a0ff694fa1ee33602b5ee5e048599b
2016-03-15 13:28:49 -07:00
Tao Bao
a1dc633a7f
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
...
am: 3c37889299
* commit '3c37889299b7ab8df676fed7b8157484a7e5315a':
Revert "releasetools: Support OTAs that have OEM properties changes."
2016-03-15 19:24:21 +00:00
Tao Bao
3c37889299
Merge "Revert "releasetools: Support OTAs that have OEM properties changes.""
2016-03-15 19:16:33 +00:00
Tao Bao
838c68fa1a
Revert "releasetools: Support OTAs that have OEM properties changes."
...
Broke some builds.
This reverts commit c086370440
.
Change-Id: If07006db412fea6c04f8698776a2ab418125a469
2016-03-15 19:16:18 +00:00
Tao Bao
122f8823be
Merge "releasetools: Support OTAs that have OEM properties changes."
...
am: 61cebe79f4
* commit '61cebe79f4949217181431fb347b7577d74ecc75':
releasetools: Support OTAs that have OEM properties changes.
2016-03-15 18:43:03 +00:00
Tao Bao
61cebe79f4
Merge "releasetools: Support OTAs that have OEM properties changes."
2016-03-15 18:33:20 +00: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
Sami Tolvanen
4abe19c584
Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
...
am: b1e99acb00
* commit 'b1e99acb00818c0dc244a4203106177eb28ca66b':
Revert "Revert "build: pass version and patch level to mkbootimg""
2016-03-15 17:47:08 +00:00
Sami Tolvanen
b1e99acb00
Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
2016-03-15 17:37:27 +00:00
Sami Tolvanen
3303d909a1
Revert "Revert "build: pass version and patch level to mkbootimg""
...
This reverts commit 494a9090f9
.
Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
2016-03-15 16:49:30 +00: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
Alex Klyubin
30ec3f3716
Merge "Fix two cosmetic issues in signapk."
...
am: 4ddc07afa9
* commit '4ddc07afa90ab2be2c62c16829de4f3a68776d8e':
Fix two cosmetic issues in signapk.
2016-03-14 21:52:41 +00:00
Alex Klyubin
82bf99bb4e
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
Change-Id: I97199310d4b4451271a75bb6c6d0463e0b788be9
2016-03-14 13:33:26 -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
Sami Tolvanen
478eb605b7
Merge "Revert "build: pass version and patch level to mkbootimg""
...
am: 926096eff6
* commit '926096eff685265912f3050bb43715cfa36df0aa':
Revert "build: pass version and patch level to mkbootimg"
2016-03-11 00:24:23 +00:00
Sami Tolvanen
926096eff6
Merge "Revert "build: pass version and patch level to mkbootimg""
2016-03-11 00:11:25 +00:00
Sami Tolvanen
494a9090f9
Revert "build: pass version and patch level to mkbootimg"
...
This reverts commit 8fb47f191f
.
Bug: 27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
2016-03-11 00:08:57 +00:00
smain@google.com
19aff2a258
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
...
am: e6e3c70b67
* commit 'e6e3c70b6741d0ddd1de67e2f244f18a7117f8c5':
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.
2016-03-10 23:19:49 +00:00
smain@google.com
a2a4e2b055
make image resource URLs relative so they work in offline docs
...
am: 0d7e38042d
* commit '0d7e38042df5b3bcc91532f937b15d7aafabae2f':
make image resource URLs relative so they work in offline docs
2016-03-10 23:14:08 +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
1926bfe8d2
change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
...
am: 5e37eef425
* commit '5e37eef4255bb1b3709d0d99e004003728eaf3c7':
change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
2016-03-10 18:09:18 +00: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
2b4ddff0eb
Merge "Hook incremental ext4 image generation into build" into nyc-dev
...
am: 6a3185f23d
* commit '6a3185f23d820f31cc928d5467eda94f3a93e31c':
Hook incremental ext4 image generation into build
2016-03-09 21:07:30 +00: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
e6caa33438
Merge "Use the update-binary in the source build for downgrade OTAs."
...
am: 6be54d774b
* commit '6be54d774ba13c79e96b12b797e95bd5bdba0344':
Use the update-binary in the source build for downgrade OTAs.
2016-03-09 03:32:44 +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