Commit graph

29928 commits

Author SHA1 Message Date
Dan Willemsen
7fba3347b9 Merge "Forbid libstdc++ on Linux and Darwin" 2016-06-15 22:38:30 +00:00
Dan Willemsen
3773b45c3b Fix kati --no_ignore_dirty usage
Kati only supports a single use of --no_ignore_dirty, so we were
ignoring the SOONG_ANDROID_MK file, and only detecting changes to
SOONG_MAKEVARS_MK. Fix this by using a pattern that should apply to both
of those makefiles.

Change-Id: I46390f9887f95f1db0efe4e93339667f35ebc67c
2016-06-15 14:55:58 -07:00
Alex Klyubin
37a8cc5f51 Merge \\"Don\\'t depend on Bouncy Castle.\\" am: 1fb96c3ff5
am: 3b36c7960d

Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
2016-06-15 20:48:11 +00:00
Alex Klyubin
3b36c7960d Merge \"Don\'t depend on Bouncy Castle.\"
am: 1fb96c3ff5

Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
2016-06-15 20:43:46 +00:00
Dan Willemsen
327fa9c411 Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.

Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
2016-06-15 13:41:45 -07:00
Alex Klyubin
1fb96c3ff5 Merge "Don't depend on Bouncy Castle." 2016-06-15 20:32:35 +00:00
Mohamad Ayyash
52cef0d4f0 Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am: 3bddf74752

Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
2016-06-15 16:12:55 +00:00
Tao Bao
46ff838582 Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am: a8d3741f1a

Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
2016-06-15 16:12:52 +00:00
Mohamad Ayyash
3bddf74752 Merge "Pass block_list param to mksquashfs" into nyc-dev 2016-06-15 16:03:08 +00:00
Mohamad Ayyash
a8d3741f1a Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev 2016-06-15 16:03:08 +00:00
Alex Klyubin
e000bb9be6 Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am: 98b4f07dfc
am: 5e8b2c9207

Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
2016-06-14 22:43:35 +00:00
Alex Klyubin
5e8b2c9207 Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\"
am: 98b4f07dfc

Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
2016-06-14 22:41:02 +00:00
Treehugger Robot
98b4f07dfc Merge "Faster and cleaner way to obtain UTF-8 encoded form." 2016-06-14 22:37:10 +00:00
Dan Willemsen
4ed18f541e Merge \\"Use more prebuilt build-tools\\" am: 6c0c720389
am: ffb643e487

Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
2016-06-14 22:33:19 +00:00
Dan Willemsen
ffb643e487 Merge \"Use more prebuilt build-tools\"
am: 6c0c720389

Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
2016-06-14 22:28:02 +00:00
Treehugger Robot
6c0c720389 Merge "Use more prebuilt build-tools" 2016-06-14 22:14:07 +00:00
Alex Klyubin
d4761a19b8 Faster and cleaner way to obtain UTF-8 encoded form.
Instead of specifying character encoding by name, the faster, cleaner,
and safer way is to use StandardCharsets.UTF_8.

Bug: 27461702
Change-Id: I897284d3ceeb44a21cc74de09a9b25f6aec8c205
2016-06-14 14:18:21 -07:00
Alex Klyubin
3836690d20 Merge \\"APK JAR signature verifier.\\" am: cf89865b95
am: d1af20e103

Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
2016-06-14 21:05:45 +00:00
Alex Klyubin
d1af20e103 Merge \"APK JAR signature verifier.\"
am: cf89865b95

Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
2016-06-14 21:03:04 +00:00
Alex Klyubin
cf89865b95 Merge "APK JAR signature verifier." 2016-06-14 20:56:28 +00:00
Dan Willemsen
7c2d228701 Use more prebuilt build-tools
For acp, we've been using an old prebuilt in prebuilts/sdk, but it's not
part of the SDK. Instead, we'll use a prebuilt in the build-tools
repository.

For ijar, we've been using the host libstdc++ to workaround the lack of
libc++ on some unbundled branches. Instead, use a prebuilt that can use
libc++.

For ziptime, we've been disabling it on unbundled branches, due to the
lack of libc++. Instead, use a prebuilt version of ziptime that can use
the prebuilt libc++.

Change-Id: If80f845ea06f76e3fe6765964e77c864eaf303d0
2016-06-14 13:50:38 -07:00
Dan Willemsen
2bebbb485a Merge \\"Add a libc++ version of ijar for prebuilt use\\" am: 06f3e8349f
am: 38ff3ae039

Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
2016-06-14 20:28:24 +00:00
Jeff Hao
d546f767fa Merge \\"Skip uses-library check for preopted apps.\\" am: 7b4c07f1d5
am: baf8869991

Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
2016-06-14 20:28:22 +00:00
Dan Willemsen
38ff3ae039 Merge \"Add a libc++ version of ijar for prebuilt use\"
am: 06f3e8349f

Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
2016-06-14 20:04:21 +00:00
Jeff Hao
baf8869991 Merge \"Skip uses-library check for preopted apps.\"
am: 7b4c07f1d5

Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
2016-06-14 20:04:20 +00:00
Treehugger Robot
06f3e8349f Merge "Add a libc++ version of ijar for prebuilt use" 2016-06-14 18:34:38 +00:00
Alex Klyubin
7f770c0963 Don't depend on Bouncy Castle.
This switches PKCS#7 SignedData generation code from Bouncy Castle to
OpenJDK's proprietary internal API. This is to avoid depending on a
huge library that's not really needed. In the longer term, it's best
to add our own implementation of PKCS#7 SignedData building, parsing,
and verification. This will give the code more power to mimic what the
Android platform does.

Bug: 27461702
Change-Id: I29f1ceea1293e35424fde69c0f2969d551345100
2016-06-14 11:20:49 -07:00
Dan Willemsen
e19d451f49 Add a libc++ version of ijar for prebuilt use
I'll remove the old version once we've moved over to the prebuilts.

Change-Id: Ifd8d396f8b653abbe958cd34e69831a6ca378649
2016-06-14 10:30:06 -07:00
Alex Klyubin
8b47001e9b APK JAR signature verifier.
This adds JAR signature verification to ApkVerifier.

Bug: 27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
2016-06-14 10:28:36 -07:00
Treehugger Robot
7b4c07f1d5 Merge "Skip uses-library check for preopted apps." 2016-06-14 17:22:25 +00:00
Jeff Hao
7d49d21ac5 Skip uses-library check for preopted apps.
am: b00263f96a

Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
2016-06-14 02:15:53 +00:00
Yabin Cui
494c2b5ebc Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455
am: bebdc16a68

Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
2016-06-14 01:24:05 +00:00
Jeff Hao
00b75bc41a Skip uses-library check for preopted apps.
Bug: 26880306

(cherry-picked from commit b00263f96a)

Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
2016-06-13 18:14:27 -07:00
Jeff Hao
b00263f96a Skip uses-library check for preopted apps.
Bug: 26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
2016-06-13 17:32:06 -07:00
Yabin Cui
bebdc16a68 Merge \"Add option to link static lite protobuf library.\"
am: e6fae50455

Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
2016-06-14 00:25:05 +00:00
Yabin Cui
e6fae50455 Merge "Add option to link static lite protobuf library." 2016-06-14 00:16:34 +00:00
Alex Klyubin
346a716b87 Merge \\"More general OutputStreamDataSink.\\" am: dca955a9bd
am: 58c8559979

Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f
2016-06-13 20:06:33 +00:00
Alex Klyubin
58c8559979 Merge \"More general OutputStreamDataSink.\"
am: dca955a9bd

Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf
2016-06-13 20:02:12 +00:00
Alex Klyubin
dca955a9bd Merge "More general OutputStreamDataSink." 2016-06-13 19:49:01 +00:00
Alex Klyubin
876080b437 Merge \\"Fix inefficiency in APK entry data alignment.\\" am: a85e0aa883
am: 7fe6ba2197

Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321
2016-06-13 18:26:05 +00:00
Alex Klyubin
7fe6ba2197 Merge \"Fix inefficiency in APK entry data alignment.\"
am: a85e0aa883

Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f
2016-06-13 18:22:19 +00:00
Alex Klyubin
a85e0aa883 Merge "Fix inefficiency in APK entry data alignment." 2016-06-13 18:14:18 +00:00
Alex Klyubin
e54b2753e4 More general OutputStreamDataSink.
This replaces the less general DataSink which outputs into a
ByteArrayOutputStream with a more general DataSink which outputs into
an OutputStream.

Bug: 27461702
Change-Id: I9467f38c41f586b71f35edb3602fd6e57153184f
2016-06-13 10:19:26 -07:00
Tao Bao
293fd135c7 releasetools: Disable using imgdiff for squashfs.
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.

For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.

Disable using imgdiff for squashfs images, and use bsdiff instead.

Bug: 22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
2016-06-13 10:04:23 -07:00
Mohamad Ayyash
c3484f7f64 Pass block_list param to mksquashfs
Needed to generate image.map and to optimize the OTA size

BUG: 22322817
Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-13 09:48:05 -07:00
David Zeuthen
a787117cc5 Merge \\"bvb: Update path to key since repo was moved.\\" am: 8b3b1727da
am: 8ab7487660

Change-Id: I04b9b35c392b6e99b15f4c78358c70c9a9794532
2016-06-13 16:06:54 +00:00
David Zeuthen
8ab7487660 Merge \"bvb: Update path to key since repo was moved.\"
am: 8b3b1727da

Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2
2016-06-13 16:03:11 +00:00
David Zeuthen
8b3b1727da Merge "bvb: Update path to key since repo was moved." 2016-06-13 15:54:36 +00:00
David Zeuthen
bca24302bb bvb: Update path to key since repo was moved.
We recently moved Brillo verified boot from system/bvb to external/bvb
so update the path accordingly.

TEST=Build with 'BOARD_BVB_ENABLE := true' succeeds.
BUG=29099910

Change-Id: I66f3b90e23d6b2afc09f81af571ede7b573325e9
2016-06-13 11:26:26 -04:00
Yohann Roussel
9530d9131c Merge \\"Do not force turn off of Jack warning\\" am: 0a26fc0ace
am: 5185323de9

Change-Id: I054396d9bdb88822ca75be61a88e18f08213242d
2016-06-13 14:48:53 +00:00