OSDN Git Service
Dan Willemsen [Wed, 15 Jun 2016 22:57:47 +0000 (22:57 +0000)]
Merge \\"Forbid libstdc++ on Linux and Darwin\\" am:
7fba3347b9
am:
3cd95c708d
Change-Id: I78315783b64ce9a1a796795af6f7818604367cf9
Dan Willemsen [Wed, 15 Jun 2016 22:54:59 +0000 (22:54 +0000)]
Merge \"Forbid libstdc++ on Linux and Darwin\"
am:
7fba3347b9
Change-Id: I896febb45ca1245fa56dff113463606ac88b7c01
Dan Willemsen [Wed, 15 Jun 2016 22:38:30 +0000 (22:38 +0000)]
Merge "Forbid libstdc++ on Linux and Darwin"
Alex Klyubin [Wed, 15 Jun 2016 20:48:11 +0000 (20:48 +0000)]
Merge \\"Don\\'t depend on Bouncy Castle.\\" am:
1fb96c3ff5
am:
3b36c7960d
Change-Id: Ib33cb3a8aaa94df96731a16f20a7ef5415f42a3f
Alex Klyubin [Wed, 15 Jun 2016 20:43:46 +0000 (20:43 +0000)]
Merge \"Don\'t depend on Bouncy Castle.\"
am:
1fb96c3ff5
Change-Id: I04401121eb3ad2e026268f37ffe9d19d95478325
Dan Willemsen [Wed, 15 Jun 2016 20:41:45 +0000 (13:41 -0700)]
Forbid libstdc++ on Linux and Darwin
The last user has been removed, forbid any modules from selecting this.
Change-Id: Idd9ef6ca4b6c6754935d59c4a09c7d213ae481c1
Alex Klyubin [Wed, 15 Jun 2016 20:32:34 +0000 (20:32 +0000)]
Merge "Don't depend on Bouncy Castle."
Mohamad Ayyash [Wed, 15 Jun 2016 16:12:55 +0000 (16:12 +0000)]
Merge \"Pass block_list param to mksquashfs\" into nyc-dev
am:
3bddf74752
Change-Id: I1679c255b297a36bc10b50ff9d6214c92d763489
Tao Bao [Wed, 15 Jun 2016 16:12:52 +0000 (16:12 +0000)]
Merge \"releasetools: Disable using imgdiff for squashfs.\" into nyc-dev
am:
a8d3741f1a
Change-Id: If8392b72a865f53449a1d5ca7b52de7697c4b412
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "Pass block_list param to mksquashfs" into nyc-dev
Mohamad Ayyash [Wed, 15 Jun 2016 16:03:08 +0000 (16:03 +0000)]
Merge "releasetools: Disable using imgdiff for squashfs." into nyc-dev
Alex Klyubin [Tue, 14 Jun 2016 22:43:35 +0000 (22:43 +0000)]
Merge \\"Faster and cleaner way to obtain UTF-8 encoded form.\\" am:
98b4f07dfc
am:
5e8b2c9207
Change-Id: I48bc0772fcb1acf050d04f650c1b0eca8a6c79cb
Alex Klyubin [Tue, 14 Jun 2016 22:41:02 +0000 (22:41 +0000)]
Merge \"Faster and cleaner way to obtain UTF-8 encoded form.\"
am:
98b4f07dfc
Change-Id: Ic5e071d01ea0fd9a091097e3659f16c0b71f5ae6
Treehugger Robot [Tue, 14 Jun 2016 22:37:10 +0000 (22:37 +0000)]
Merge "Faster and cleaner way to obtain UTF-8 encoded form."
Dan Willemsen [Tue, 14 Jun 2016 22:33:19 +0000 (22:33 +0000)]
Merge \\"Use more prebuilt build-tools\\" am:
6c0c720389
am:
ffb643e487
Change-Id: I4cdec816470a05193c4c303f3c6343815f2b671c
Dan Willemsen [Tue, 14 Jun 2016 22:28:02 +0000 (22:28 +0000)]
Merge \"Use more prebuilt build-tools\"
am:
6c0c720389
Change-Id: Icb67388bf084f2de872e9df8747b70cbde42b5f9
Treehugger Robot [Tue, 14 Jun 2016 22:14:06 +0000 (22:14 +0000)]
Merge "Use more prebuilt build-tools"
Alex Klyubin [Tue, 14 Jun 2016 21:18:21 +0000 (14:18 -0700)]
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
Alex Klyubin [Tue, 14 Jun 2016 21:05:45 +0000 (21:05 +0000)]
Merge \\"APK JAR signature verifier.\\" am:
cf89865b95
am:
d1af20e103
Change-Id: I7cae6cda81bebf10b7abf3175d428452620e83bf
Alex Klyubin [Tue, 14 Jun 2016 21:03:04 +0000 (21:03 +0000)]
Merge \"APK JAR signature verifier.\"
am:
cf89865b95
Change-Id: If54865fdf6d290ab38a3f6a0f3eec2142c55e8d0
Alex Klyubin [Tue, 14 Jun 2016 20:56:27 +0000 (20:56 +0000)]
Merge "APK JAR signature verifier."
Dan Willemsen [Mon, 6 Jun 2016 21:44:00 +0000 (14:44 -0700)]
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
Dan Willemsen [Tue, 14 Jun 2016 20:28:24 +0000 (20:28 +0000)]
Merge \\"Add a libc++ version of ijar for prebuilt use\\" am:
06f3e8349f
am:
38ff3ae039
Change-Id: I83c7313db392a137b0d54232d4f122b54120ce2a
Jeff Hao [Tue, 14 Jun 2016 20:28:22 +0000 (20:28 +0000)]
Merge \\"Skip uses-library check for preopted apps.\\" am:
7b4c07f1d5
am:
baf8869991
Change-Id: Id14f3aca9e19d900deb31ce35292810f9d35fafe
Dan Willemsen [Tue, 14 Jun 2016 20:04:21 +0000 (20:04 +0000)]
Merge \"Add a libc++ version of ijar for prebuilt use\"
am:
06f3e8349f
Change-Id: I284c7c85de71551e608e4210ab71b17e36229e09
Jeff Hao [Tue, 14 Jun 2016 20:04:20 +0000 (20:04 +0000)]
Merge \"Skip uses-library check for preopted apps.\"
am:
7b4c07f1d5
Change-Id: I6e027842b3eb70b333efd20ccf6798e88baef436
Treehugger Robot [Tue, 14 Jun 2016 18:34:38 +0000 (18:34 +0000)]
Merge "Add a libc++ version of ijar for prebuilt use"
Alex Klyubin [Tue, 14 Jun 2016 17:26:41 +0000 (10:26 -0700)]
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
Dan Willemsen [Tue, 14 Jun 2016 17:30:06 +0000 (10:30 -0700)]
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
Alex Klyubin [Wed, 8 Jun 2016 21:54:28 +0000 (14:54 -0700)]
APK JAR signature verifier.
This adds JAR signature verification to ApkVerifier.
Bug:
27461702
Change-Id: Id2b72bea7869be66268f6bc1387e1559ee02ff9d
Treehugger Robot [Tue, 14 Jun 2016 17:22:25 +0000 (17:22 +0000)]
Merge "Skip uses-library check for preopted apps."
Jeff Hao [Tue, 14 Jun 2016 02:15:53 +0000 (02:15 +0000)]
Skip uses-library check for preopted apps.
am:
b00263f96a
Change-Id: Icc9170bc494750eac12f141e7afd09d36564a2cc
Yabin Cui [Tue, 14 Jun 2016 01:24:05 +0000 (01:24 +0000)]
Merge \\"Add option to link static lite protobuf library.\\" am:
e6fae50455
am:
bebdc16a68
Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
(cherry-picked from commit
b00263f96a90c9f77cf7d8d90742a0884290bf60)
Change-Id: I22beccaf61ca30cf1487a25f80e1c3fd7bdf2c62
Jeff Hao [Mon, 13 Jun 2016 23:53:11 +0000 (16:53 -0700)]
Skip uses-library check for preopted apps.
Bug:
26880306
Change-Id: I97c75cceca30624b5f0c984a5032fdfaf632a90a
Yabin Cui [Tue, 14 Jun 2016 00:25:05 +0000 (00:25 +0000)]
Merge \"Add option to link static lite protobuf library.\"
am:
e6fae50455
Change-Id: Idcc3c54033724a9cef17a219b4c118689eaad297
Yabin Cui [Tue, 14 Jun 2016 00:16:34 +0000 (00:16 +0000)]
Merge "Add option to link static lite protobuf library."
Alex Klyubin [Mon, 13 Jun 2016 20:06:33 +0000 (20:06 +0000)]
Merge \\"More general OutputStreamDataSink.\\" am:
dca955a9bd
am:
58c8559979
Change-Id: I1caf9f4ae2650dfadcb003315c12a30a3288fd4f
Alex Klyubin [Mon, 13 Jun 2016 20:02:12 +0000 (20:02 +0000)]
Merge \"More general OutputStreamDataSink.\"
am:
dca955a9bd
Change-Id: Id94e07f6007c3288c0501d6cd9017680108e4dbf
Alex Klyubin [Mon, 13 Jun 2016 19:49:01 +0000 (19:49 +0000)]
Merge "More general OutputStreamDataSink."
Alex Klyubin [Mon, 13 Jun 2016 18:26:05 +0000 (18:26 +0000)]
Merge \\"Fix inefficiency in APK entry data alignment.\\" am:
a85e0aa883
am:
7fe6ba2197
Change-Id: I97934b2a4cdfabb463f5012149ef28a15768c321
Alex Klyubin [Mon, 13 Jun 2016 18:22:19 +0000 (18:22 +0000)]
Merge \"Fix inefficiency in APK entry data alignment.\"
am:
a85e0aa883
Change-Id: I8c1b8116ab66c83e9b73f103adaf6237e51a6c1f
Alex Klyubin [Mon, 13 Jun 2016 18:14:18 +0000 (18:14 +0000)]
Merge "Fix inefficiency in APK entry data alignment."
Alex Klyubin [Mon, 13 Jun 2016 17:19:26 +0000 (10:19 -0700)]
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
Tao Bao [Sat, 11 Jun 2016 19:19:23 +0000 (12:19 -0700)]
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
Mohamad Ayyash [Mon, 13 Jun 2016 16:46:58 +0000 (09:46 -0700)]
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>
David Zeuthen [Mon, 13 Jun 2016 16:06:54 +0000 (16:06 +0000)]
Merge \\"bvb: Update path to key since repo was moved.\\" am:
8b3b1727da
am:
8ab7487660
Change-Id: I04b9b35c392b6e99b15f4c78358c70c9a9794532
David Zeuthen [Mon, 13 Jun 2016 16:03:11 +0000 (16:03 +0000)]
Merge \"bvb: Update path to key since repo was moved.\"
am:
8b3b1727da
Change-Id: I0256523824d49aa59ba61eec18b85a9a2a9324d2
David Zeuthen [Mon, 13 Jun 2016 15:54:36 +0000 (15:54 +0000)]
Merge "bvb: Update path to key since repo was moved."
David Zeuthen [Mon, 13 Jun 2016 15:26:26 +0000 (11:26 -0400)]
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
Yohann Roussel [Mon, 13 Jun 2016 14:48:53 +0000 (14:48 +0000)]
Merge \\"Do not force turn off of Jack warning\\" am:
0a26fc0ace
am:
5185323de9
Change-Id: I054396d9bdb88822ca75be61a88e18f08213242d
Yohann Roussel [Mon, 13 Jun 2016 14:44:56 +0000 (14:44 +0000)]
Merge \"Do not force turn off of Jack warning\"
am:
0a26fc0ace
Change-Id: Iddfabd648876281596bc8c571968d18589f1f581
Yohann Roussel [Mon, 13 Jun 2016 14:33:47 +0000 (14:33 +0000)]
Merge "Do not force turn off of Jack warning"
Alex Klyubin [Sun, 12 Jun 2016 00:42:29 +0000 (17:42 -0700)]
Fix inefficiency in APK entry data alignment.
26f00cda4b979d7e74db6872990682335b36612b introduced a bug where an
APK entry's extra field is padded for alignment purposes when no
padding is necessary because the entry is aligned without any padding
bytes.
Bug:
27461702
Change-Id: Icb164dbaa26d9686412e2920318a9f40c5ce9751
Alex Deymo [Sat, 11 Jun 2016 01:12:06 +0000 (01:12 +0000)]
Merge \\"Redirect subprocess stderr to stdout in verbose mode.\\" am:
1318ec93e7
am:
74d7b31f7d
Change-Id: Ia9757f09dead577349b0cf4b97cb062f30d0f45d
Alex Deymo [Sat, 11 Jun 2016 01:08:11 +0000 (01:08 +0000)]
Merge \"Redirect subprocess stderr to stdout in verbose mode.\"
am:
1318ec93e7
Change-Id: If411ad0cd8aba960e4ab8600a5dd1532e5bd9dca
Treehugger Robot [Sat, 11 Jun 2016 00:56:31 +0000 (00:56 +0000)]
Merge "Redirect subprocess stderr to stdout in verbose mode."
Alex Deymo [Fri, 10 Jun 2016 23:38:31 +0000 (16:38 -0700)]
Redirect subprocess stderr to stdout in verbose mode.
This patch uses subprocess.communicate instead of subprocess.wait to
prevent deadlock if any of the child processes outputs too much data,
and redirects the subprocess output to stdout when running in verbose
mode.
With this patch `ota_from_target_files -v` prints the delta_generator
output in stdout, and no output if '-v' is not passed.
Bug: None
TEST=ota_from_target_files -v ...
Change-Id: Id66e4f3360a6f91d61a3ce96d53afbccdaa19da5
David Turner [Fri, 10 Jun 2016 18:18:37 +0000 (18:18 +0000)]
Merge \\"goldfish_setup: grant /system/bin/sh exec access\\" am:
7a866d783c
am:
0db549d72c
Change-Id: I861c80be973d94e666aa9c26c1519c93b220c094
Nick Kralevich [Fri, 10 Jun 2016 18:15:13 +0000 (18:15 +0000)]
Merge \"goldfish_setup: grant /system/bin/sh exec access\"
am:
7a866d783c
Change-Id: I340d78d01171de2eda4f25a2b4dbe0d637f35d59
David Turner [Fri, 10 Jun 2016 18:04:26 +0000 (18:04 +0000)]
Merge "goldfish_setup: grant /system/bin/sh exec access"
Tianjie Xu [Fri, 10 Jun 2016 17:24:52 +0000 (17:24 +0000)]
Add build.version.incremental to metadata
am:
d06f07eef4
Change-Id: I4f0b89d69154ef32bbb04fa905fdc014c911d571
Tianjie Xu [Thu, 9 Jun 2016 21:18:45 +0000 (14:18 -0700)]
Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.
Example of metadata:
....
post-build-incremental=
2951741
post-timestamp=
1465345123
pre-build-incremental=
2943039
pre-device=bullhead
...
Bug:
28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
Nick Kralevich [Wed, 25 May 2016 00:36:23 +0000 (17:36 -0700)]
goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
(cherrypicked from commit
501c88c0290eb2308c110398f106411260863bb8)
Bug:
28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
Vikas Marwaha [Thu, 9 Jun 2016 03:14:48 +0000 (20:14 -0700)]
resolve merge conflicts of
07886f1 to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
Vikas Marwaha [Thu, 9 Jun 2016 02:38:50 +0000 (02:38 +0000)]
Merge \"Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level.\"
am:
e5c1af2dd0
Change-Id: I0dd1cd7ebe6b7ede5f019566d844b12fe40fb40c
Vikas Marwaha [Thu, 9 Jun 2016 02:30:57 +0000 (02:30 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the new read only product property ro.product.first_api_level."
Dan Willemsen [Wed, 8 Jun 2016 21:17:05 +0000 (21:17 +0000)]
Merge \\"Rewrite LDLIBS and SHARED_LIBRARIES\\" am:
a8d13592ac
am:
d8210177af
Change-Id: If466674f33ba7d98a0f8da249bc0dc57efdcf621
Dan Willemsen [Wed, 8 Jun 2016 21:14:36 +0000 (21:14 +0000)]
Merge \"Rewrite LDLIBS and SHARED_LIBRARIES\"
am:
a8d13592ac
Change-Id: Ic1cdfd510ff26c279a2628b58c3a1db7ef172b5c
Dan Willemsen [Wed, 8 Jun 2016 21:09:34 +0000 (21:09 +0000)]
Merge "Rewrite LDLIBS and SHARED_LIBRARIES"
Alex Klyubin [Wed, 8 Jun 2016 21:06:41 +0000 (21:06 +0000)]
Merge \\"APK Signature Scheme v2 APK verifier.\\" am:
4f8bde47ae
am:
9cf15a318b
Change-Id: Iada08b1831d737ab702b6f7aee7cb21648a06bf0
Alex Klyubin [Wed, 8 Jun 2016 21:04:12 +0000 (21:04 +0000)]
Merge \"APK Signature Scheme v2 APK verifier.\"
am:
4f8bde47ae
Change-Id: I0a9476be7b5da7166a1d20c2b64b82fcdfae4973
Alex Klyubin [Wed, 8 Jun 2016 20:51:58 +0000 (20:51 +0000)]
Merge "APK Signature Scheme v2 APK verifier."
Alex Klyubin [Wed, 8 Jun 2016 15:31:24 +0000 (15:31 +0000)]
Merge \\"Fix DSA APK signatures for API Level 8 and lower.\\" am:
ebe68ec237
am:
b926969a84
Change-Id: Ie93b77c066e7637cdb704d3167dc65936aca16b1
Alex Klyubin [Wed, 8 Jun 2016 15:26:16 +0000 (15:26 +0000)]
Merge \"Fix DSA APK signatures for API Level 8 and lower.\"
am:
ebe68ec237
Change-Id: I1bb11e4d47a572f5e0b9e9205910ca4dc675f671
Alex Klyubin [Tue, 7 Jun 2016 20:18:57 +0000 (13:18 -0700)]
APK Signature Scheme v2 APK verifier.
This adds the ApkVerifier class which verifies APKs using APK
Signature Scheme v2 only. In a follow-up commit this class will be
extended to verify APKs using JAR signature scheme when necessary.
The APK verifier is designed to not just verify an APK, but also
report errors, warnings, and information about signers in a structured
way, to enable tools to surface this information to users in various
ways.
Bug:
27461702
Change-Id: I10c6ba436021d86b6dbf6d3cf44494652adacb66
Alex Klyubin [Wed, 8 Jun 2016 15:17:42 +0000 (15:17 +0000)]
Merge "Fix DSA APK signatures for API Level 8 and lower."
Yohann Roussel [Wed, 8 Jun 2016 15:00:09 +0000 (17:00 +0200)]
Do not force turn off of Jack warning
When ANDROID_JACK_EXTRA_ARGS is defined there is no reason to still turn
off those warnings.
Change-Id: Ic7ac02c72ed3b7b0eaca9394c9fc7d92d5dfa871
Dan Willemsen [Tue, 7 Jun 2016 23:55:57 +0000 (16:55 -0700)]
Rewrite LDLIBS and SHARED_LIBRARIES
LOCAL_LDLIBS was the only correct way to use NDK libraries, but few used
it correctly. It also often got confused with LOCAL_LDFLAGS, so move the
flags to the correct variable.
For binaries that weren't using the NDK (empty LOCAL_SDK_VERSION), it
was never valid to use LOCAL_LDLIBS, as dependencies would not be
properly set up, and could lead to random build failures. So convert any
-l linker flags to using LOCAL_SHARED_LIBRARIES automatically.
For binaries built using the NDK (LOCAL_SDK_VERSION set), they were
required to use LOCAL_LDLIBS for prebuilt NDK libraries, otherwise they
would get headers and dependencies to the platform versions. Any
non-prebuilt LOCAL_LDLIBS would miss dependencies. So move the NDK
prebuilt libraries to LDLIBS from SHARED_LIBRARIES, and move everything
else to SHARED_LIBRARIES.
So now, for device modules, LOCAL_SHARED_LIBRARIES should always be
used, and we'll do the right thing. LOCAL_LDLIBS should only be used for
host libraries from the system.
Change-Id: Ide34c7afdcfb6507a378d45a42471729e489a9e0
Yabin Cui [Wed, 8 Jun 2016 02:21:12 +0000 (19:21 -0700)]
Add option to link static lite protobuf library.
Bug:
28114205
Change-Id: Id2b7e42017a53138c60b92de8d196ca92bc38053
Ian Pedowitz [Wed, 8 Jun 2016 03:09:44 +0000 (03:09 +0000)]
Merge \"Removing N from PLATFORM_VERSION_ALL_CODENAMES\" into nyc-dev
am:
ddc0c5e0a0
Change-Id: I1f68aa77d52fb85a3d87a3155b9eefb1ff647c31
Ian Pedowitz [Wed, 8 Jun 2016 03:05:39 +0000 (03:05 +0000)]
Merge "Removing N from PLATFORM_VERSION_ALL_CODENAMES" into nyc-dev
Gustav Sennton [Tue, 7 Jun 2016 16:32:33 +0000 (16:32 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
am:
837b86aa56
* commit '
837b86aa5696fea28a0acfde7361a3c5d5824624':
Add variable PRODUCT_SHIPPING_API_LEVEL.
Change-Id: I692a44938baa8e462041786b1f394dc5b41ac8e0
Gustav Sennton [Tue, 7 Jun 2016 16:21:15 +0000 (16:21 +0000)]
Merge "Add variable PRODUCT_SHIPPING_API_LEVEL." into nyc-dev
Dan Willemsen [Tue, 7 Jun 2016 00:09:39 +0000 (00:09 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests" am:
e72fc63901
am:
10461b78f0
* commit '
10461b78f0955d9dba8d32045d1e35ff0f9a5c8c':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ia11b54676d3b33e58c177a5a375f29233657524e
Dan Willemsen [Tue, 7 Jun 2016 00:05:35 +0000 (00:05 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
am:
e72fc63901
* commit '
e72fc639014809b4d4239d7f7754c6950f1ad546':
Add NATIVE_TESTS class, move host native tests
Change-Id: Ifb0401242afe1e6e16666001faf3d55471200c3f
Dan Willemsen [Mon, 6 Jun 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add NATIVE_TESTS class, move host native tests"
Dan Willemsen [Mon, 6 Jun 2016 23:05:06 +0000 (23:05 +0000)]
Merge "Switch some build tools to Soong" am:
c52d09e694
am:
8a78c90a95
* commit '
8a78c90a95a3a0c5886b333e90994721eeb92734':
Switch some build tools to Soong
Change-Id: I481784785375dfb6790d14681eb110e0f67bf65c
Dan Willemsen [Mon, 6 Jun 2016 22:58:28 +0000 (22:58 +0000)]
Merge "Switch some build tools to Soong"
am:
c52d09e694
* commit '
c52d09e6944e531e02242cf971020cb2c0cf9844':
Switch some build tools to Soong
Change-Id: I4ba945cad1eda7c696cd770243e226a09ff735ac
Treehugger Robot [Mon, 6 Jun 2016 22:51:56 +0000 (22:51 +0000)]
Merge "Switch some build tools to Soong"
Alex Klyubin [Mon, 6 Jun 2016 21:58:23 +0000 (14:58 -0700)]
Fix DSA APK signatures for API Level 8 and lower.
This modifies JAR signing code to produce DSA signatures which are
accepted by all Android platforms rather than only API Level 9 and
higher.
The issue is that by default Bouncy Castle uses OID 1.2.840.10040.4.3
(dsaWithSha1) in PKCS #7 CMS SignerInfo whereas Android accepts that
only since API Level 9. However, OID 1.2.840.10040.4.1 (dsa) is
accepted by all Android platforms.
Bug:
27461702
Change-Id: I24256a255bcdc2108bdb447557af7568a2c096e3
Dan Willemsen [Mon, 6 Jun 2016 21:41:32 +0000 (14:41 -0700)]
Switch some build tools to Soong
In preparation for including them in prebuilts/build-tools.
acp: We use a prebuilt in prebuilts/sdk, but it's not part of the sdk.
ijar: We use the host libstdc++ to workaround the lack of libc++ on
some unbundled branches.
ziptime: We disable this on unbundled builds, due to the lack of libc++.
Change-Id: Ib9766b1dbddd151c38ff27c529865200ab37fce1
Dan Willemsen [Mon, 6 Jun 2016 21:43:16 +0000 (21:43 +0000)]
Merge "Remove dead rgb2565" am:
a571e83095
am:
d1f0eb15c8
* commit '
d1f0eb15c812b8c4ea8697b9e2171846e6510884':
Remove dead rgb2565
Change-Id: I6a95c5cf31a05822d85fce16d1e9b311dd759cee
Dan Willemsen [Mon, 6 Jun 2016 21:39:48 +0000 (21:39 +0000)]
Merge "Remove dead rgb2565"
am:
a571e83095
* commit '
a571e83095a72d595e5e4e365e0ae52aefd64356':
Remove dead rgb2565
Change-Id: I6dae3bbd804591a0e91f3467f021c5ee2dde4bf7
Treehugger Robot [Mon, 6 Jun 2016 21:35:47 +0000 (21:35 +0000)]
Merge "Remove dead rgb2565"
Dan Willemsen [Mon, 6 Jun 2016 21:33:07 +0000 (21:33 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment" am:
27a55cd3c7
am:
f03398b651
* commit '
f03398b6519e1d9695c61da450346d5a0f0f8528':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I9fce3d3c203b89295529c72de4d094ff62d178fd
Dan Willemsen [Mon, 6 Jun 2016 21:27:10 +0000 (21:27 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
am:
27a55cd3c7
* commit '
27a55cd3c703c190f933630e503d963ef7478183':
Drop CLANG and CLANG_CXX in the environment
Change-Id: I3850b1783fb47cda05f1a7799ff8ceddb589e033
Alex Klyubin [Mon, 6 Jun 2016 21:23:05 +0000 (21:23 +0000)]
Merge "Improve efficiency of using the DataSource abstraction." am:
7353eabd14
am:
732b29a5c3
* commit '
732b29a5c38a3a33bdffea662875e6a8dab894b3':
Improve efficiency of using the DataSource abstraction.
Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2
Treehugger Robot [Mon, 6 Jun 2016 21:22:57 +0000 (21:22 +0000)]
Merge "Drop CLANG and CLANG_CXX in the environment"
Alex Klyubin [Mon, 6 Jun 2016 21:17:02 +0000 (21:17 +0000)]
Merge "Improve efficiency of using the DataSource abstraction."
am:
7353eabd14
* commit '
7353eabd14cbfae2c123a58cae4ce1e770ee351d':
Improve efficiency of using the DataSource abstraction.
Change-Id: Ia1ab6c7d0b94c59ab6d7b41828e8e5d676c212e5