Commit graph

27691 commits

Author SHA1 Message Date
Christopher Wiley
e46193a608 Merge "Separate aidl dependencies from compiler dependencies" am: 8edda3afdf
am: cfd817d058

* commit 'cfd817d058994ebda3b98db4e8113752753d422e':
  Separate aidl dependencies from compiler dependencies
2016-01-21 18:29:25 +00:00
Christopher Wiley
d1eea90a72 Merge "Keep aidl generated C++ inside the generated folder" am: 11feb8b075
am: 7c52b2d878

* commit '7c52b2d878e6234cb6e36942c87c438fa1e80240':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:29:15 +00:00
Christopher Wiley
cfd817d058 Merge "Separate aidl dependencies from compiler dependencies"
am: 8edda3afdf

* commit '8edda3afdf1bf3327706d89a5b4b5ce53feedbe5':
  Separate aidl dependencies from compiler dependencies
2016-01-21 18:27:02 +00:00
Christopher Wiley
7c52b2d878 Merge "Keep aidl generated C++ inside the generated folder"
am: 11feb8b075

* commit '11feb8b075ce48fc4b6386049a666a5e888247f8':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:26:54 +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
Christopher Wiley
8edda3afdf Merge "Separate aidl dependencies from compiler dependencies" 2016-01-21 18:19:05 +00:00
Christopher Wiley
11feb8b075 Merge "Keep aidl generated C++ inside the generated folder" 2016-01-21 18:17:29 +00:00
Narayan Kamath
9a39d29241 Merge "Make a confusing error message clearer." 2016-01-21 10:15:40 +00:00
Tao Bao
38812d684b Makefile: Add the payload public key into system image.
For non-Brillo devices using AB update, add the payload signing public
key to the system image
(system/etc/update_engine/update-payload-key.pub.pem).

We first need to sign the payload with some private key, and pack it
into an Android OTA package. Then the whole zip package will be signed
again with the device key. This is to comply with the two existing OTA
flows (Android and CrOS).

We use the same device key to do the two signings, but update_engine
expects the key in RSA public key format. This CL extracts the public
key from x509 certificate and adds it to the system image.

Bug: 25715402
Change-Id: I6f6c1148534250ddb6d9e554175c7a35bceda99e
2016-01-20 21:29:00 -08:00
Alex Klyubin
983f822d35 Merge "Command-line flag to disable signing with APK Signature Scheme v2." am: 3cc3605010
am: aafc1e9665

* commit 'aafc1e9665a3392891d54a22da8a5b7b292cfddb':
  Command-line flag to disable signing with APK Signature Scheme v2.
2016-01-21 01:42:35 +00:00
Alex Klyubin
aafc1e9665 Merge "Command-line flag to disable signing with APK Signature Scheme v2."
am: 3cc3605010

* commit '3cc36050109fa1f310f11fca980ac415cb58bee7':
  Command-line flag to disable signing with APK Signature Scheme v2.
2016-01-21 01:28:23 +00:00
Colin Cross
d3f3ab77fd Set flag when using sdk tools in place
New version of build/ execute the tools from prebuilts/sdk/tools in
place, old versions copy them to $(HOST_OUT_EXECUTABLES).  build/ and
prebuilts/sdk often use mixed versions, set a flag that
prebuilts/sdk/tools/Android.mk can use to determine when it is using an
old build/ directory.

Change-Id: Iad2f96c35203fd3b0976946d229bfa8ab4acb150
2016-01-20 16:08:49 -08:00
Calin Juravle
388bae1ca3 Merge "Enable the use of jit profiles" 2016-01-20 22:31:37 +00:00
Alex Klyubin
dd910c5945 Make signapk sign using APK Signature Scheme v2.
APKs are now signed with the usual JAR signature scheme and then
with the APK Signature Scheme v2.

APK Signature Scheme v2 is a whole-file signature scheme which aims
to protect every single bit of the APK as opposed to the JAR signature
scheme which protects only the names and uncompressed contents of ZIP
entries.

The two main goals of APK Signature Scheme v2 are:
1. Detect any unauthorized modifications to the APK. This is achieved
   by making the signature cover every byte of the APK being signed.
2. Enable much faster signature and integrity verification. This is
   achieved by requiring only a minimal amount of APK parsing before
   the signature is verified, thus completely bypassing ZIP entry
   decompression and by making integrity verification parallelizable
   by employing a hash tree.

Bug: 25794543
Change-Id: I275d2a6d0a98504891985309b9dfff2e0e44b878
2016-01-20 13:35:21 -08:00
Alex Klyubin
3cc3605010 Merge "Command-line flag to disable signing with APK Signature Scheme v2." 2016-01-20 21:02:29 +00:00
Alex Klyubin
9b54a565c9 Command-line flag to disable signing with APK Signature Scheme v2.
This change makes signapk not reject the --disable-v2 command-line
flag which may be used by build scripts in some branches. The flag
is currently ignored.

This change is landed separately from the actual support for APK
Signature Scheme v2 because of unbundled branches which use prebuilt
versions of signapk.

Bug: 25794543
Change-Id: I900966244b8b6296b1f443bf98830cc7f7cc81a8
2016-01-20 12:55:16 -08:00
Christopher Wiley
087f327304 Separate aidl dependencies from compiler dependencies
Both aidl and clang/gcc were putting their dependencies in the same
place.  Move aidl's dependencies to a file ending with .aidl.P rather
than the compiler's .P.

While here, inform kati that we have these special dep files.

Bug:26409006
Test: Rebuild, note both files being generated

Change-Id: I29d2eea822235d60713c2059f3a314e475eb5aa3
2016-01-20 12:54:09 -08:00
Narayan Kamath
1b5f487f10 Make a confusing error message clearer.
The java version doesn't matter here.

Change-Id: Ieb933f87d1255e7aea5d21b3ac96e4f1f755deea
2016-01-20 18:48:59 +00:00
Christopher Wiley
257796c62d Keep aidl generated C++ inside the generated folder
Transform ../ to dotdot/ for C++ generateds from .aidl source files.
This forces us to use one layer of indirection to calculate the build
rules for .aidl files, since we can no longer use a pattern rule.

This was tested by modifying system/tools/aidl's Android.mk to refer to
its .aidl files by going up two directories and then repeating the
directories again.  When I print the build rules with $(info) I see that
dotdot/ appears in appropriate places (C++ paths, but not .aidl paths).

Bug: 26407018
Test: Described above.

Change-Id: I397c9d10408c0c66d8b5a247a1f34eb4bf4f74ce
2016-01-20 09:17:20 -08:00
Yigit Boyar
5b97d086e9 Fix data binding source paths
Bug: 26581427

Change-Id: If8acc01fa610663248fa894ac04b3268bc77f739
2016-01-20 12:20:10 +00:00
Chih-hung Hsieh
70c41f2f26 Merge "Set USE_CLANG_PLATFORM_BUILD to default true." am: c36a9760e1
am: 2ba3e15de1

* commit '2ba3e15de184d869d82e21111dfe3471f1c4846b':
  Set USE_CLANG_PLATFORM_BUILD to default true.
2016-01-20 00:02:49 +00:00
Chih-hung Hsieh
2ba3e15de1 Merge "Set USE_CLANG_PLATFORM_BUILD to default true."
am: c36a9760e1

* commit 'c36a9760e17bc0ce1cc815572886e640bb0ded18':
  Set USE_CLANG_PLATFORM_BUILD to default true.
2016-01-19 23:57:53 +00:00
Tao Bao
c098e9efd9 Generate OTA packages for A/B update.
It calls brillo_update_payload to generate the payload for A/B update.
And packages the payload according to Android OTA package format.

Note that it only supports generating full/incremental OTAs with this
CL. Signing for release may not work properly at the moment.

Bug: 25715402
Change-Id: I4ac8505bacad28a572a9320dc8b52dd0f1ce47f5
2016-01-19 15:46:34 -08:00
Chih-hung Hsieh
c36a9760e1 Merge "Set USE_CLANG_PLATFORM_BUILD to default true." 2016-01-19 23:40:56 +00:00
Tao Bao
49fe96c376 Merge "Makefile: Pack brillo_update_payload and shflags into otatools." am: 4dc400e753
am: d08cc69b6e

* commit 'd08cc69b6ec59654a0ff59e5a4e286faa31629c7':
  Makefile: Pack brillo_update_payload and shflags into otatools.
2016-01-19 23:06:40 +00:00
Tao Bao
d08cc69b6e Merge "Makefile: Pack brillo_update_payload and shflags into otatools."
am: 4dc400e753

* commit '4dc400e75336d0e09f509c9fd100c49cfb42ed5c':
  Makefile: Pack brillo_update_payload and shflags into otatools.
2016-01-19 23:04:12 +00:00
Tao Bao
4dc400e753 Merge "Makefile: Pack brillo_update_payload and shflags into otatools." 2016-01-19 22:57:25 +00:00
Tao Bao
6d8a8cc634 Makefile: Pack brillo_update_payload and shflags into otatools.
brillo_update_payload and shflags are the scripts to generate A/B OTA
package (payload). Include them into otatools.zip.

brillo_update_payload was already included in previous CL. Move it to
the folder for executables.

Bug: 25715402
Change-Id: Idf9c05767c24c55d058cc30e696f06d4eb5fd53b
2016-01-19 14:51:51 -08:00
Dan Willemsen
45d38c06b4 Pass the arm/thumb cflags to assembly files
This effectively changes the default instruction set of assembly files
from arm to thumb in order to match the default for C/C++.

Change-Id: I8684f144a1195b53b3e0fdd04cacf77f6a131c7e
2016-01-19 12:37:17 -08:00
Michael Wright
29252a9f86 Merge "Only fail on known-bad grep configurations." 2016-01-19 20:03:36 +00:00
Chih-Hung Hsieh
8dd69d97f6 Set USE_CLANG_PLATFORM_BUILD to default true.
BUG: 26102335
Change-Id: I3b9fa2dfbee361410caf163147945ab448bb8ddf
2016-01-19 11:43:44 -08:00
Makoto Onuki
5e58a99176 Merge "Add BlockedNumberProvider to core.mk" 2016-01-19 19:16:34 +00:00
Michael Wright
9dca07efdc Only fail on known-bad grep configurations.
Rather than exit when any grep configuration is set, only fail on ones we know
to be bad. This lets people use benign configuration options such as
--color=auto and --directories=skip.

Bug: 21260618
Change-Id: I3641c7895df4b43e36a983ea6ad877969cd38bf5
2016-01-18 18:13:03 -08:00
Neil Fuller
719dee7062 Merge "Remove synchronized from the public API docs" am: 8cb9be66b7
am: 75bbddecaa

* commit '75bbddecaa9f9d82c2f2751b389188f0a41e3284':
  Remove synchronized from the public API docs
2016-01-18 19:42:12 +00:00
Neil Fuller
75bbddecaa Merge "Remove synchronized from the public API docs"
am: 8cb9be66b7

* commit '8cb9be66b7878478aa61e7b752e3c8b916811299':
  Remove synchronized from the public API docs
2016-01-18 19:40:31 +00:00
Neil Fuller
8cb9be66b7 Merge "Remove synchronized from the public API docs" 2016-01-18 19:36:27 +00:00
Dan Willemsen
543623c2b6 Merge "Add -Werror=date-time to target builds" am: 5c3f812507
am: 9f41040b00

* commit '9f41040b000bf2ea98b70eea6f60a41385d55fe3':
  Add -Werror=date-time to target builds
2016-01-16 20:18:54 +00:00
Dan Willemsen
9f41040b00 Merge "Add -Werror=date-time to target builds"
am: 5c3f812507

* commit '5c3f812507bd025da2fc3d5fa40e8a278535dff2':
  Add -Werror=date-time to target builds
2016-01-16 20:17:01 +00:00
Dan Willemsen
5c3f812507 Merge "Add -Werror=date-time to target builds" 2016-01-16 20:13:30 +00:00
Neil Fuller
586f3cb4e0 Merge "Revert "Revert "Revert "Revert "Make OpenJDK 8 the default""""" 2016-01-15 23:36:19 +00:00
Tianjie Xu
fb56c581ff Merge "Fix print error of numbers of blocks" am: 2acd8a2eef
am: dabcd36224

* commit 'dabcd3622433dfe43931701fbc36db61f8dca075':
  Fix print error of numbers of blocks
2016-01-15 19:41:24 +00:00
Tianjie Xu
dabcd36224 Merge "Fix print error of numbers of blocks"
am: 2acd8a2eef

* commit '2acd8a2eef88973ce222a4ed90efaa94ede1a30b':
  Fix print error of numbers of blocks
2016-01-15 19:21:00 +00:00
Tianjie Xu
2acd8a2eef Merge "Fix print error of numbers of blocks" 2016-01-15 19:07:22 +00:00
Neil Fuller
3dfaceea79 Revert "Revert "Revert "Revert "Make OpenJDK 8 the default""""
This reverts commit ee89f219ea.

This reapplies commit
1bd16b67c4
for the third time.

Change-Id: I3be72f643f5ddce87dfc39d98f19e395525554d8
2016-01-15 16:35:54 +00:00
Neil Fuller
79a6f53d7d Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.

Bug: 25767152
(cherry-picked from commit a37bdc89b4)

Change-Id: Id03a6e383118ab716ce870a1d7a3740656420fe7
2016-01-15 04:52:22 +00:00
Tianjie Xu
ebe39a096a Fix print error of numbers of blocks
The total number of blocks to pack as new data was printed incorrectly.
Fix printing.

Change-Id: I6a6bb8dd6682d9c57943ceb1a728995f9529e2fd
2016-01-14 19:13:21 -08:00
Neil Fuller
571055a442 Merge "Revert "Revert "Revert "Make OpenJDK 8 the default"""" 2016-01-14 21:15:17 +00:00
Neil Fuller
ee89f219ea Revert "Revert "Revert "Make OpenJDK 8 the default"""
This reverts commit c288d65762.

The launch control change that switched various builds
to JDK 8 was reverted so JDK 8 can't be mandatory without
breaking builds.

Change-Id: I5e3feb21488d3bb57c5718cfe105a931eeaa9587
2016-01-14 21:12:27 +00:00
Tianjie Xu
fcab264954 Merge "Adjust the size limit for splitting large files" am: 9b2fe7e0b8
am: 9ccf073210

* commit '9ccf073210b380c1526a0c51fcb815da3326b96d':
  Adjust the size limit for splitting large files
2016-01-14 20:20:26 +00:00
Makoto Onuki
00003c38b3 Add BlockedNumberProvider to core.mk
Bug 26232372

Change-Id: I4e77588587d75dcb110caef8d76b64bb396ca052
2016-01-14 11:31:27 -08:00