Commit Graph

26465 Commits

Author SHA1 Message Date
Dan Willemsen 822f20f933 Merge "Diff .art/.oat/.odex files now that they are deterministic"
am: 78861d7e6e

* commit '78861d7e6e56a770eb6c50370aa405992a3fab4c':
  Diff .art/.oat/.odex files now that they are deterministic
2016-02-01 22:42:50 +00:00
Dan Willemsen 78861d7e6e Merge "Diff .art/.oat/.odex files now that they are deterministic" 2016-02-01 22:38:53 +00:00
Dan Willemsen 734d78cdf6 Diff .art/.oat/.odex files now that they are deterministic
This also whitelists the ro.build.user property, which may change based
on host username.

Bug: 26687569
Change-Id: I8f3244c2325dd80a7961c474655f0c50670d1b46
2016-02-01 13:41:30 -08:00
Colin Cross 01394871fd Merge "Don\'t force color diagnostics outside of ninja"
am: 41fed8c082

* commit '41fed8c08262bd8ff52bbebd8429dbd2042c4450':
  Don't force color diagnostics outside of ninja
2016-02-01 19:02:07 +00:00
Colin Cross 41fed8c082 Merge "Don't force color diagnostics outside of ninja" 2016-02-01 18:57:50 +00:00
Shinichiro Hamaji b1e250b44a Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""
am: d6184e1da9

* commit 'd6184e1da9e56b0b66cba48756ce210564d34523':
  Revert "Use dependency files generated by llvm-rs-cc for Java"
2016-02-01 08:20:17 +00:00
Shinichiro Hamaji d6184e1da9 Merge "Revert "Use dependency files generated by llvm-rs-cc for Java"" 2016-02-01 08:16:42 +00:00
Shinichiro Hamaji 5f50ea3bc9 Revert "Use dependency files generated by llvm-rs-cc for Java"
This reverts commit 4c474617d4.

Change-Id: I66c46360d0ccf927c807ddd5cfbc56cbd97ed4a2
2016-02-01 08:08:26 +00:00
Shinichiro Hamaji a73d744e36 Merge "Use dependency files generated by llvm-rs-cc for Java"
am: 3fdb9ad716

* commit '3fdb9ad716bad829b0df06afdf2a45552830b23d':
  Use dependency files generated by llvm-rs-cc for Java
2016-02-01 07:54:53 +00:00
Shinichiro Hamaji 45e6d88785 Merge "Use .KATI_DEPFILE for files generated by aidl-java"
am: 465fd483f5

* commit '465fd483f512df16e788a6497b45e7a763a6dcd7':
  Use .KATI_DEPFILE for files generated by aidl-java
2016-02-01 07:54:39 +00:00
Shinichiro Hamaji 3fdb9ad716 Merge "Use dependency files generated by llvm-rs-cc for Java" 2016-02-01 07:50:32 +00:00
Shinichiro Hamaji 465fd483f5 Merge "Use .KATI_DEPFILE for files generated by aidl-java" 2016-02-01 07:50:01 +00:00
Dan Willemsen 10b4db6f0e Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs."
am: 0d85dab09a

* commit '0d85dab09a09de48535e4139b858e5e4bef8565f':
  Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
2016-01-30 02:47:35 +00:00
Dan Willemsen 991c840313 Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES"
am: 224466b1af

* commit '224466b1aff87a73d1b875902f97981dd4b96585':
  Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
2016-01-30 02:47:20 +00:00
Dan Willemsen 0d85dab09a Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." 2016-01-30 02:44:27 +00:00
Dan Willemsen 224466b1af Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES" 2016-01-30 02:44:12 +00:00
Alex Klyubin 1cafe66be2 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."
am: 01ac26d942

* commit '01ac26d9422d8d54d3992ba9dd4506896c8556dd':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
2016-01-30 00:02:34 +00:00
Alex Klyubin 01ac26d942 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS." 2016-01-29 23:58:27 +00:00
Alex Klyubin 061289c432 Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
This reverts commit c2a36afd67.

Change-Id: I4389bf99aeb213198c1c501ba9462bd4a4540d0a
2016-01-29 23:56:44 +00:00
Lee Campbell fd5d6f440a Merge "brillo: Remove dependency on java for Brillo"
am: 6c8e3e4108

* commit '6c8e3e41085d75184ae321c12e26cf26002552d3':
  brillo: Remove dependency on java for Brillo
2016-01-29 23:46:16 +00:00
Lee Campbell 6c8e3e4108 Merge "brillo: Remove dependency on java for Brillo" 2016-01-29 23:42:19 +00:00
Lee Campbell 3d8bf2994c brillo: Remove dependency on java for Brillo
Brillo does not require Java. Add a JAVA_NOT_REQUIRED
flag to the build system to make the jdk requirment optional

Also don't build signapk for Brillo

BUG: 25281898
Change-Id: I31e68cc7d076bf6c234699c77c0ea1ea428be4f5
2016-01-29 15:38:53 -08:00
Alex Klyubin 6c41036bcf Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
Previously, the timestamp was one hour ahead of NotBefore of the
signer's certificate, adjusted for the current timezone. With this
change the MS-DOS timestamp in output APK/ZIP files is
Jan 1 2009 00:00:00.

Bug: 26864066
Change-Id: Id6263c38ac7042489ab695454f8e0fb2d85a3958
2016-01-29 13:10:03 -08:00
Alex Klyubin 7a86884a9a Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am: 50f872c696

* commit '50f872c6967428cea172746af24506342745dcaa':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-29 20:22:29 +00:00
Alex Klyubin 50f872c696 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-29 20:17:49 +00:00
Alex Klyubin c2a36afd67 Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280

(cherry picked from commit de5bc04717)

Change-Id: I4b100750e47788ab6ed897a0a5abfd33542e8676
2016-01-29 10:17:02 -08:00
Shinichiro Hamaji 4c474617d4 Use dependency files generated by llvm-rs-cc for Java
This is similar to 2e45fd036a
but this CL is for generated java code.

For C++ code llvm-rs-cc defines two targets but it defines
three targets for Java. The sed script was updated to handle
both cases appropriately.

Bug: 26839129
Change-Id: I5c7705c67f3c65c4c14f74558e603f8ec9f35879
2016-01-28 17:03:02 +09:00
Shinichiro Hamaji 2a0d1fee20 Use .KATI_DEPFILE for files generated by aidl-java
Bug: 26839129
Change-Id: Ief611969b28aea3bb12097ba91d40f3e5010d647
2016-01-28 16:13:05 +09:00
Dan Willemsen 3bb168f10d Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
We have been reordering objects to the linker based on how they were
generated. In soong, they're ordered based on the order listed in the
src_files.

Keep track of which source files created which object files so that we
can create the ordered list. Optionally change the order, based on
BINARY_OBJECTS_ORDER. That way we can compare make and soong builds.

Since we're keeping track of the used source files, warn when an entry
in LOCAL_SRC_FILES is not used. (whether it is an unused file like a
header, or a typo)

LOCAL_GENERATED_SOURCES is not verified, since it is valid to add
headers and other files in that list (to set up dependencies).

Change-Id: I1dfbbb3aa570c11c1db3b7133e46ed0b8c3b8989
2016-01-27 16:48:02 -08:00
Alex Klyubin e40660247d Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
am: 4a97cde443

* commit '4a97cde443829f1a3bf40fe6e820ba5b01e3bf87':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
2016-01-27 17:52:55 +00:00
Alex Klyubin 4a97cde443 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" 2016-01-27 17:49:40 +00:00
Alex Klyubin a80a8085e0 Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit 74df828cb5. This commit is breaking a build, again...

Change-Id: I2df561d68302ba4c83e90a64a7bf203645033a3b
2016-01-27 17:45:42 +00:00
Alex Klyubin 5132fe2ef9 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am: 72d152f478

* commit '72d152f478a6a48c5e06053e440801f61d256a50':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-27 17:01:54 +00:00
Alex Klyubin 72d152f478 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-27 16:55:16 +00:00
Neil Fuller e71759c8ff Merge "Doclava template changes associated with default methods"
am: 26990b0f64

* commit '26990b0f64e47c3f5366a03573f4d1e3408301d9':
  Doclava template changes associated with default methods
2016-01-27 13:32:37 +00:00
Neil Fuller 26990b0f64 Merge "Doclava template changes associated with default methods" 2016-01-27 13:25:43 +00:00
Neil Fuller 8f7d4b7474 Doclava template changes associated with default methods
The ordering of method declaration modifiers changed slightly
to reflect the ordering given in:

http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4

Bug: 26241119
(cherry-picked from commit ca59875e12)

Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb
2016-01-27 11:57:34 +00:00
Shinichiro Hamaji a4e26de266 Merge "Write clean_steps.mk with multiple commands"
am: 3e2f5d83a4

* commit '3e2f5d83a47d3f9b3f1a2f57c894dff64ae6c603':
  Write clean_steps.mk with multiple commands
2016-01-27 08:39:38 +00:00
Shinichiro Hamaji 3e2f5d83a4 Merge "Write clean_steps.mk with multiple commands" 2016-01-27 08:36:04 +00:00
Shinichiro Hamaji 1326f65c2f Write clean_steps.mk with multiple commands
$(INTERNAL_CLEAN_STEPS) could be too big to be fit in a single
command line.

Bug: 26707439
Change-Id: Ieed6c772980d06c2418a9246b025bca7a6f568aa
2016-01-27 14:59:56 +09:00
Alex Deymo 95b0f7d3cc Merge "Place the META/ dir first in the target_files.zip."
am: 2857b7a3d7

* commit '2857b7a3d7e2057cf60db36a528358a58a8711bc':
  Place the META/ dir first in the target_files.zip.
2016-01-27 03:33:20 +00:00
Alex Deymo 2857b7a3d7 Merge "Place the META/ dir first in the target_files.zip." 2016-01-27 03:28:53 +00:00
Alex Deymo 92cfd6fc2b Place the META/ dir first in the target_files.zip.
To help early verification of a target_files.zip being uploaded to our
servers, we place the META/ directory first in the .zip file, so checks
against the product_id.txt and product_version.txt don't need to wait
for the whole file to upload.

Note that META/*filesystem_config.txt files are generated and added to
the .zip file at a later point, so they are not included at the
beginning.

Bug: 26806325
TEST=`make dist` and `unzip -l out/dist/edison-target_files-eng.$USER.zip` shows most META/ files first.

Change-Id: I1955645412688f5c7823063ed56606b251daccfd
2016-01-26 18:52:10 -08:00
Kevin Cernekee 753536092c Merge "README: Update docs"
am: 30177c45b4

* commit '30177c45b4e61ae11749bf9106c64d1b1e2ae517':
  README: Update docs
2016-01-26 23:51:39 +00:00
Kevin Cernekee 30177c45b4 Merge "README: Update docs" 2016-01-26 23:45:37 +00:00
Alex Klyubin 74df828cb5 Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280
Change-Id: I058393e0971d0d6559dbd69ea902754c6c7cab14
(cherry picked from commit de5bc04717)
2016-01-26 18:41:57 +00:00
Neil Fuller 97ffb1ab83 Merge "Revert "Revert "Make OpenJDK 8 the default"""
am: 385ac86745

* commit '385ac86745e2294e3ac8da7540659a2150ac7923':
  Revert "Revert "Make OpenJDK 8 the default""
2016-01-26 10:37:15 +00:00
Neil Fuller 385ac86745 Merge "Revert "Revert "Make OpenJDK 8 the default""" 2016-01-26 10:33:54 +00:00
Shinichiro Hamaji d39a629d3a Merge "Use dependency files generated by llvm-rs-cc"
am: 19f99a742d

* commit '19f99a742d393ffe41737d7c2e86c7b6ebe83ff0':
  Use dependency files generated by llvm-rs-cc
2016-01-26 06:40:11 +00:00
Shinichiro Hamaji 19f99a742d Merge "Use dependency files generated by llvm-rs-cc" 2016-01-26 06:36:02 +00:00