Commit Graph

3804 Commits

Author SHA1 Message Date
Trevor Johns 1348277a29 Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
(cherry picked from commit bf234fdfba)

Change-Id: Id57aecad79fb601488799ed99437118d1a9faf7c
2016-04-12 18:45:12 +00:00
Tao Bao 41e5c4e065 releasetools: Use fixed timestamp in otacerts.zip.
am: 7ee3a96

* commit '7ee3a9678e7191c48f0ba4e04792fe97925c1aa1':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I9e8260491819e00eea6f4eb55b1722ae1670ae85
2016-04-12 15:44:31 +00:00
Tao Bao 7ee3a9678e releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
2016-04-11 23:10:00 -07:00
Trevor Johns 35142509fb Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev
am: 6edfbfa

* commit '6edfbfabad1ddbda00e0fcc713672f6e63acdf44': (44 commits)
  Tabs js error fix, DevSite css issues fix, Search filtering
  new styles and tab-highlighting to support custom Android Studio site design
  tweak the NDK download analytics event tag
  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.
  increment version for fetched js and cs files to avoid proxy caching.
  Migrating web search api to custom search api on templates-sdk
  new search results layout. no more custom suggestions; just API matches and organic results.
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
  Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
  increment docs.js version to force browser refresh. needed to load recent fixes to the zippies.
  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.
  Docs: Change MD5 to SHA1 in NDK download table column heading
  change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
  Fix broken suggestions for preview.
  Revert "Search for suggestion matches across PREVIEW_RESOURCES."
  Docs: Updates NDK download table for NDKr11
  make image resource URLs relative so they work in offline docs
  docs: Update DAC template to force refresh of resources
  Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
  Add styles to compress the summary table presentation.
  ...

Change-Id: I47a5c85da5c4f8edffa9ca3e6ba4bb573cc2666c
2016-04-11 22:16:20 +00: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 230ef583b0 Merge "Use fs_config files for mksquashfs" into nyc-dev
am: b354a61

* commit 'b354a61f3ec3b4c6463aac2a80f23e5772b6b164':
  Use fs_config files for mksquashfs

Change-Id: I422bd6f5b8e7e587bec3caef1525497904268a96
2016-04-08 17:52:24 +00: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
Ying Wang be667a1128 Merge "Correct usage message for build_image.py" am: d63ec28
am: 334a418

* commit '334a4185a5ca29086963a8d450fb7a9e972cbd77':
  Correct usage message for build_image.py

Change-Id: Iee000ee9974b4cb7329fab87dc81fdba2affe93d
2016-04-07 22:24:15 +00:00
Ying Wang d63ec28bcf Merge "Correct usage message for build_image.py" 2016-04-07 21:51:21 +00:00
Alex Klyubin 5f520cef37 Merge "Remove support for DSA with SHA-512 from v2 signing." am: d71e120
am: a62efba

* commit 'a62efba64f0e352310ecf7b5eb15727a1d52bdf9':
  Remove support for DSA with SHA-512 from v2 signing.

Change-Id: I1e0757fe57118ee6012ebb28ffcae8bb604a2c25
2016-04-07 20:11:05 +00:00
Alex Klyubin d71e12028b Merge "Remove support for DSA with SHA-512 from v2 signing." 2016-04-07 19:56:03 +00:00
Colin Cross 37241826f8 Merge "makeparallel: reset make\'s unlimited stack" am: a034129
am: 15f63e2

* commit '15f63e262ea685ff593e5e8c320ab88b0b15d878':
  makeparallel: reset make's unlimited stack

Change-Id: Iffb1189b6e883dbe7730cff571fb2836987aa66d
2016-04-07 18:12:57 +00:00
Alex Klyubin 60817689fa Remove support for DSA with SHA-512 from v2 signing.
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.

Bug: 24331392
Change-Id: Ifba90ad5b11188bb968c28d9e0ed3f9cb13ce2e7
2016-04-07 10:24:56 -07:00
Colin Cross 8f9a53258b makeparallel: reset make's unlimited stack
make 3.81 sets its own stack size to be unlimited, but accidentally
leaves it unlimited for all child processes.  If it is unlimited, reset
it back to a reasonable default (8MB).

See http://savannah.gnu.org/bugs/?22010

Change-Id: Ieb0289823f12a421b59d8ab5292d3df3c6dfc27e
2016-04-06 17:59:14 -07:00
Maria Bornski 885dbb5111 Correct usage message for build_image.py
target_out_dir is now a required argument. Include this in the usage message.

Change-Id: If77d94ec5350b2c737d1dd1df28a51167b173058
2016-04-06 17:26:31 -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
Mark Salyzyn 62b696af33 Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" am: 54cb05c
am: 43284e2

* commit '43284e2dc5e1c802226bf1608dd85d33ad22907a':
  fs_config: introduce TARGET_FS_CONFIG_GEN

Change-Id: Idd4879971867f697a20c42dda4fcdf8086fd358f
2016-04-05 00:09:17 +00:00
smain@google.com 7281802438 tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
2016-04-04 16:17:01 -07:00
Mark Salyzyn 54cb05c01a Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" 2016-04-04 22:37:33 +00: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
Chih-Hung Hsieh 84a2f2ac51 Merge "Recognize more Clang-Tidy google warning patterns." am: 29667bf
am: f6601e6

* commit 'f6601e6f7e1d070189c8f763e1eab2957086c352':
  Recognize more Clang-Tidy google warning patterns.

Change-Id: Ied251994be7f327628d6e43519322afe18a24e02
2016-04-01 16:35:07 +00:00
Chih-Hung Hsieh d742e90fe9 Recognize more Clang-Tidy google warning patterns.
* Many AOSP C/C++ code have google-readability warnings.

Bug: http://b/27779618
Change-Id: Ic7d33b957da5c1062410f48ef18bb68a5aa259e9
2016-03-31 16:14:55 -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
Chih-Hung Hsieh 2b27844bf9 Merge "Recognize Clang-Tidy warning messages." am: af90d19
am: 0d7da16

* commit '0d7da16751ad591b0c6960750afe8279d9b0fcfb':
  Recognize Clang-Tidy warning messages.

Change-Id: I607e15d55e5cda3b86fed938fb3734a442562660
2016-03-30 19:03:13 +00:00
Chih-Hung Hsieh 90d4619f02 Recognize Clang-Tidy warning messages.
* Put all Clang-Tidy warning messages in a group for now.
  There are too many coding style warnings.
* Change the 'top' link to the top of the page.
* Add a few more new clang compiler warnings.

Bug: http://b/27779618
Change-Id: I385b9db927a397704b56f53440301352da8694cf
2016-03-29 15:33:11 -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
Tao Bao 40361b2787 Merge "rangelib.py: Add parse_raw() method."
am: 973ce2f

* commit '973ce2f018a30b9bf1c282b48990e271b11dcb6a':
  rangelib.py: Add parse_raw() method.
2016-03-25 20:06:51 +00:00
Tao Bao 8179d68458 rangelib.py: Add parse_raw() method.
parse_raw() parses a string generated by RangeSet.to_string_raw().

>>> RangeSet.parse_raw(RangeSet("0-9").to_string_raw())
<RangeSet("0-9")>

Change-Id: Ia74daa30476d5e9ad73c368f4ecc64c755b734a5
2016-03-24 11:08:51 -07: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
Alex Klyubin 74a03e5008 Merge "Fix bug in APK entry alignment."
am: 7f4eade

* commit '7f4eadef7ed93c3cd2c68fcd4991142d075da2dd':
  Fix bug in APK entry alignment.
2016-03-24 01:05:11 +00:00
Alex Klyubin 37a0ecd329 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
Change-Id: I8242b037e21ba7bcf45d0fe2afc8bfc47f1ec314
2016-03-23 13:09:42 -07:00
Chih-Hung Hsieh af5606e50d Merge "Dump table of warning counts before all warnings."
am: 6d41f7e

* commit '6d41f7e1233da88714edaf3f21f88ff8023558f4':
  Dump table of warning counts before all warnings.
2016-03-23 01:00:51 +00:00
Chih-Hung Hsieh eb293f654e Merge "Add more patterns, dump sorted unique warnings."
am: 52ab1bc

* commit '52ab1bc17989f933ff4a73df82eeb1654d36d26d':
  Add more patterns, dump sorted unique warnings.
2016-03-23 01:00:51 +00:00
smain@google.com 1a2e2076bf remove the \'refonly\' templates. no longer needed, as the standard templates now have conditions to handle the reference only design. bug: 27667787
am: 6405ed9

* commit '6405ed9d512dd07066e76d6db1cab4f73aa3c702':
  remove the 'refonly' templates. no longer needed, as the standard templates now have conditions to handle the reference only design. bug: 27667787
2016-03-22 23:17:30 +00:00
smain@google.com fc9c6f2859 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
am: 9a12a2f

* commit '9a12a2f82fa74db6a32e7e99e33d1fc106a4db0c':
  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
2016-03-22 23:17:30 +00: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
Chih-Hung Hsieh a9be47e782 Dump table of warning counts before all warnings.
* The table of warning counts has links to each warning pattern section,
  which has a new anchor.
* Each warning pattern section has a new link to the 'top' of the table
  of warning counts.
* Background color of unknown warnings is changed to more visible light blue.

BUG: 27698849
Change-Id: Ia3d4a8511bd42f44f6a47afcb9c3889f6d62b9f2
2016-03-22 10:44:11 -07:00
Chih-Hung Hsieh ba0ddcd099 Add more patterns, dump sorted unique warnings.
* Sort and remove duplicated warning messages.
* Recognize more warning message patterns from new clang compiler.

BUG: http://b/27698849

Change-Id: Iebbe8600353269d8c2d49ef9d97a72be1d978a24
2016-03-22 16:31:18 +00:00
David Zeuthen 1b61e038e6 Merge "Add support for Brillo Verified Boot."
am: 003bec4

* commit '003bec431cc133134bbb29040f6c01d3f608e6ee':
  Add support for Brillo Verified Boot.
2016-03-21 15:55:23 +00:00
David Zeuthen d995f4b04d Add support for Brillo Verified Boot.
The following variables are introduced

 BOARD_BVB_ENABLE: can be set to true to build boot.img and system.img
 files compatible with Brillo Verfied Boot.

 BOARD_BVB_ROLLBACK_INDEX: can be set to an integer to use for the
 rollback index.

 BOARD_BVB_KEY_PATH, BOARD_BVB_ALGORITHM: If set, the former must be a
 path to the private key used to sign the boot image and the latter must
 be the algorithm to use. If unset, a test-key stored in the tree will
 be used.

 BOARD_BVB_MAKE_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
 make_boot_image'.

 BOARD_BVB_SIGN_BOOT_IMAGE_ARGS: Extra options to pass to 'bvbtool
 sign_boot_image'.

 BOARD_BVB_ADD_IMAGE_HASHES_ARGS: Extra options to pass to 'bvbtool
 add_image_hashes'.

 BOARD_CUSTOM_BVBTOOL: Can be set to specify what bvbtool program to
 use.

The existing BOARD_KERNEL_CMDLINE variable is also used, as are existing
kernel and initrd-related variables. Therefore, simply adding

 BOARD_BVB_ENABLE := true

to an existing Makefile should do the trick.

Bug: 26185038
TEST=Added 'BOARD_BVB_ENABLE := true' to hardware/bsp/intel/soc/edison/soc.mk
  and built an image and then ran bvbtool's info_boot_image and
  info_image_hashes commands on the resulting boot.img and system.img
  files and verified that the information was correct. Also ran 'm dist'
  and verified that the boot.img and system.img files in the resulting
  target_files.zip file had similar information.

Change-Id: I08045ed8b0cbddc7c3acdd3a6f2c4bb75cb44bbc
2016-03-18 15:25:43 -04:00
Ying Wang 2c6fbca557 Enable -Werror on zipalign
And fix the last warning to enable this flag.

Bug: 27695718
Change-Id: I70eb9c87530a9b982fbe83abea706908f0ce0356
2016-03-18 10:04:07 -07:00
Ying Wang 3fbc1c655c Merge "Fix compilation warning."
am: 5af0991

* commit '5af0991bfce1695818c76ef3db2c36cc609f4980':
  Fix compilation warning.
2016-03-17 22:55:45 +00:00