StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,408 Commits 1 Branch 0 Tags
2b6c204c73b97147ec00484904ee6f4bc003cb15
Commit Graph

4255 Commits

Author SHA1 Message Date
Dan Willemsen
11b5b1c992 Merge changes I2e00bb66,I00890229 
am: 6c597e6bdd

* commit '6c597e6bdd6f3ba9d0ab0fbad43cd7746e34ed86':
  Do not diff .odex files
  Diff libpac.so now that it is deterministic
 2016-02-03 19:02:54 +00:00
Dan Willemsen
c4438d3d29 Do not diff .odex files 
They still are not deterministic -- only the boot images were made
deterministic (.oat/.art).

Bug: 26956807
Change-Id: I2e00bb6662b4c8d184c48ef9aa34b39142c94893
 2016-02-03 10:46:39 -08:00
Dan Willemsen
8c915ee2ef Diff libpac.so now that it is deterministic 
Bug: 25348136
Change-Id: I008902299281b5ddd55a9b8c405d53eea2d56c8b
 2016-02-03 10:45:25 -08:00
Dan Willemsen
f056513b69 Merge "Diff .art/.oat/.odex files now that they are deterministic" am: 78861d7e6e 
am: 822f20f933

* commit '822f20f933d8b6d8fb16699744f5865bafbce7da':
  Diff .art/.oat/.odex files now that they are deterministic
 2016-02-01 22:44:44 +00:00
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
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
Dirk Dougherty
82e929d57c Read sdk vars from centralized files. Fix a couple of issues in navigation labels and alignment. 
Change-Id: I71da51cd20ac68ad6bc82cf8d9507cda965ec88b
 2016-01-30 14:10:02 -08:00
Dirk Dougherty
6857e477f5 Merge "Read page-defined hdf vars for sdk from a central file." into mnc-docs 2016-01-30 19:07:01 +00:00
Dan Willemsen
412057d206 Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." am: 0d85dab09a 
am: 10b4db6f0e

* commit '10b4db6f0efaac70995bf18670d6e3bd7da3c753':
  Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
 2016-01-30 02:49:22 +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
0d85dab09a Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs." 2016-01-30 02:44:27 +00:00
Alex Klyubin
357902b9de Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS." am: 01ac26d942 
am: 1cafe66be2

* commit '1cafe66be274a5a8bbbc3a0dcab9d4e8f6e5ae61':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
 2016-01-30 00:04:25 +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
d6620a3e10 Merge "brillo: Remove dependency on java for Brillo" am: 6c8e3e4108 
am: fd5d6f440a

* commit 'fd5d6f440a13643f4e645e960e1f2c417af3355a':
  brillo: Remove dependency on java for Brillo
 2016-01-29 23:48:10 +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
d0aefe7947 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: 50f872c696 
am: 7a86884a9a

* commit '7a86884a9a3474a926d30f7afdf0b7a3d307dd81':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 2016-01-29 20:25:10 +00: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
Dirk Dougherty
4eb5dacd17 Read page-defined hdf vars for sdk from a central file. 
Change-Id: I3a38492c5ae44f810a720957291d7e94e1e7d8ea
 2016-01-29 12:01:35 -08: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
Dirk Dougherty
6f10d4d761 Rebased Updated templates, styles, scripts for dac. 
Change-Id: Ida1a7f39cb6df0255f8f9c8e96a2270a0283c59e
 2016-01-28 18:28:16 -08:00
Alex Klyubin
fcc3e3915d Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" am: 4a97cde443 
am: e40660247d

* commit 'e40660247dfb4260fff31ba38b2869f644e1329b':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
 2016-01-27 17:56:21 +00: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
6c125375b0 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: 72d152f478 
am: 5132fe2ef9

* commit '5132fe2ef9f29bd748a8d34898bd183ef257e937':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 2016-01-27 17:04:09 +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
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
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
Alex Klyubin
4f90999d7a Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" am: 7382bdf8c1 
am: 2cf2509542

* commit '2cf2509542d234e4d958195c834b74da2253b2cb':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
 2016-01-25 17:26:54 +00:00
Alex Klyubin
2cf2509542 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" 
am: 7382bdf8c1

* commit '7382bdf8c1a755fe20c5979453bfeec0be73da27':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
 2016-01-25 17:24:27 +00:00
Alex Klyubin
7382bdf8c1 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" 2016-01-25 17:19:02 +00:00
Alex Klyubin
1429d5e14c Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." 
This reverts commit de5bc04717 because it's breaking some builds. Turns out some APKs have multiple sdkVersion attributes returned by aapt.

Change-Id: I013d6ef5eac473dd3900e0b9edf4c32cdc838bab
 2016-01-25 17:17:09 +00:00
Alex Klyubin
6e850d0193 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: b763b29267 
am: 2a37afd32c

* commit '2a37afd32c4bb571ced26ec738a9d9a89b5fba7e':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 2016-01-25 16:48:46 +00:00
Alex Klyubin
2a37afd32c Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 
am: b763b29267

* commit 'b763b292671b9b18dcc9a5961c173667c674a3d5':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
 2016-01-25 16:46:43 +00:00
Alex Klyubin
b763b29267 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-25 16:42:27 +00:00
Neil Fuller
6b12575440 Merge "Doclava template changes associated with default methods" 2016-01-22 19:04:46 +00:00
Tao Bao
f2ca92d9c4 Merge "Generate OTA packages for A/B update." am: bc6a66826a 
am: 4f3015f4a2

* commit '4f3015f4a286d711e0d2c6178e60462d146570b3':
  Generate OTA packages for A/B update.
 2016-01-22 18:53:29 +00:00
Alex Klyubin
c8caf263be Merge "Make signapk sign using APK Signature Scheme v2." am: b86b5344a6 
am: eafce4eefd

* commit 'eafce4eefdbf83b1cc6fd134e4916650c5768c9b':
  Make signapk sign using APK Signature Scheme v2.
 2016-01-22 18:53:23 +00:00
Neil Fuller
ca59875e12 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
Change-Id: I1dfc014b3c6218cc1f7716a760d73c9b915f2d97
 2016-01-22 10:37:17 -08:00
Tao Bao
4f3015f4a2 Merge "Generate OTA packages for A/B update." 
am: bc6a66826a

* commit 'bc6a66826a56607c2e6a02f70b21e9faa0793719':
  Generate OTA packages for A/B update.
 2016-01-22 17:27:52 +00:00
Tao Bao
bc6a66826a Merge "Generate OTA packages for A/B update." 2016-01-22 17:23:28 +00:00
Alex Klyubin
eafce4eefd Merge "Make signapk sign using APK Signature Scheme v2." 
am: b86b5344a6

* commit 'b86b5344a6b7703bfa36a203f34ca3a117051587':
  Make signapk sign using APK Signature Scheme v2.
 2016-01-22 04:12:30 +00:00
Alex Klyubin
de5bc04717 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: I048393e0971d0d6559dbd69ea902754c6c7cab14
 2016-01-21 10:25:12 -08:00