OSDN Git Service
Colin Cross [Tue, 12 Jul 2016 16:23:10 +0000 (16:23 +0000)]
Merge \\"Remove Android.bp logic from makefiles\\" am:
8bc18d35ec
am:
7dc26e8aa8
Change-Id: Iad45e3fd9b172c94df46d20425e51ae7477b5a2d
Colin Cross [Tue, 12 Jul 2016 16:20:29 +0000 (16:20 +0000)]
Merge \"Remove Android.bp logic from makefiles\"
am:
8bc18d35ec
Change-Id: I50c8180c8297feb48ff5c5eba10670b36f631921
Colin Cross [Tue, 12 Jul 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove Android.bp logic from makefiles"
Colin Cross [Mon, 11 Jul 2016 23:57:33 +0000 (16:57 -0700)]
Remove Android.bp logic from makefiles
When Soong was optional, the make build system needed extra complexity
to ignore Android.mk files that had an associated Android.bp file. Now
that Soong is required and the Android.mk files that were obsoleted by
an associated Android.bp file have been removed, remove all of the logic
that found associated Android.bp files. Android.mk files and Android.bp
files are now handled independently.
Change-Id: Ia6643d151b920689219ca8abd59ede44d230ba35
Dan Willemsen [Mon, 11 Jul 2016 20:29:47 +0000 (20:29 +0000)]
Merge \\"Extend SDK link check to java libraries\\" am:
e706372ba1
am:
720a966ce5
Change-Id: I450ebee38513ec45324c3b32b40db7d98753b22f
Dan Willemsen [Mon, 11 Jul 2016 20:27:08 +0000 (20:27 +0000)]
Merge \"Extend SDK link check to java libraries\"
am:
e706372ba1
Change-Id: Ia4cb9cfe94da5bdccce8726ed8777de13638bada
Dan Willemsen [Mon, 11 Jul 2016 20:20:40 +0000 (20:20 +0000)]
Merge "Extend SDK link check to java libraries"
Tao Bao [Mon, 11 Jul 2016 16:16:10 +0000 (16:16 +0000)]
resolve merge conflicts of
4058a71 to stage-aosp-master
am:
538ed261eb
Change-Id: I2ef81a2279ba62bc00c2a40d703666411877058f
Tao Bao [Mon, 11 Jul 2016 16:08:24 +0000 (09:08 -0700)]
resolve merge conflicts of
4058a71 to stage-aosp-master
Change-Id: I0816bfc5d8adb20e175617d97651f1474ce4e916
Treehugger Robot [Mon, 11 Jul 2016 15:55:51 +0000 (15:55 +0000)]
Merge changes from topic 'imgdiff-squashfs'
* changes:
releasetools: Fix the detection of using squashfs.
releasetools: Disable using imgdiff for squashfs.
Tao Bao [Thu, 7 Jul 2016 16:09:58 +0000 (09:09 -0700)]
releasetools: Fix the detection of using squashfs.
We should disable using imgdiff if *any* of the source and target
partitions uses squashfs.
Bug:
30004734
Test: Create an incremental with two builds with one of them uses squashfs.
Change-Id: I826cd13d7b852c548e4b45e61f5ae00f6407cac3
(cherry picked from commit
f8acad1480a3b4479c7ddfa89df8be946d83d3ed)
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
(cherry picked from commit
293fd135c7bc0c21b41f1782d21c26de64e8854a)
Dan Willemsen [Sat, 9 Jul 2016 04:33:05 +0000 (21:33 -0700)]
Extend SDK link check to java libraries
Java code using the SDK should not link to java code built with the
platform APIs or the system SDK. Java code using the system SDK should
not link to the platform APIs either, but it can link to java code using
another SDK.
Change-Id: Iaae0a7e01993cfa1e023649fbd8a7974b5eca709
Tao Bao [Fri, 8 Jul 2016 21:12:58 +0000 (21:12 +0000)]
Merge \\"releasetools: Fix the payload public key replacement.\\" am:
8a09095c34
am:
c4449f819c
Change-Id: I1614d0af292c4cb0b6c9b9bc208194c30179c7b9
Tao Bao [Fri, 8 Jul 2016 21:09:20 +0000 (21:09 +0000)]
Merge \"releasetools: Fix the payload public key replacement.\"
am:
8a09095c34
Change-Id: I464ec9dd1a12dcb06bc1dcbf340fdcbac04b9575
Treehugger Robot [Fri, 8 Jul 2016 20:58:49 +0000 (20:58 +0000)]
Merge "releasetools: Fix the payload public key replacement."
Tao Bao [Wed, 6 Jul 2016 22:28:59 +0000 (15:28 -0700)]
releasetools: Fix the payload public key replacement.
update_engine expects the extracted public key instead of the
certificate.
Bug:
28701652
Change-Id: I292d39da9e039f96d01a4214226aeb46f8cb881d
(cherry picked from commit
afaf295cb85eb4091bc8a82950acab618b4139ca)
Alex Klyubin [Thu, 7 Jul 2016 20:43:07 +0000 (20:43 +0000)]
Merge \\"Move apksigner library to tools/apksig.\\" am:
c78147c650
am:
ee7d7e3506
Change-Id: Ic11bee7e6e0fabfd1849ea9dc47fcd6dc5772d1f
Alex Klyubin [Thu, 7 Jul 2016 20:40:05 +0000 (20:40 +0000)]
Merge \"Move apksigner library to tools/apksig.\"
am:
c78147c650
Change-Id: I34e66d67736fb0a671f8030b4c94983a908e5d8c
Treehugger Robot [Thu, 7 Jul 2016 20:33:04 +0000 (20:33 +0000)]
Merge "Move apksigner library to tools/apksig."
Colin Cross [Thu, 7 Jul 2016 19:24:41 +0000 (19:24 +0000)]
Merge \\"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\\" am:
aa3525dcf1
am:
a00b2765cf
Change-Id: I703e53b7847fc4ff4b60972094d13670c3ad7207
Colin Cross [Thu, 7 Jul 2016 19:21:19 +0000 (19:21 +0000)]
Merge \"Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts\"
am:
aa3525dcf1
Change-Id: I968afb2a8abfe9763a6fc1ee7eff5abf41d3a094
Treehugger Robot [Thu, 7 Jul 2016 19:14:54 +0000 (19:14 +0000)]
Merge "Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts"
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:28:56 +0000 (18:28 +0000)]
Merge \\"Recognize new C/C++ compiler and static analyzer warnings.\\" am:
1734523900
am:
6beef3807d
Change-Id: I0452a12af98ef1ea8426c0a54211186e4123afdd
Chih-Hung Hsieh [Thu, 7 Jul 2016 18:24:12 +0000 (18:24 +0000)]
Merge \"Recognize new C/C++ compiler and static analyzer warnings.\"
am:
1734523900
Change-Id: I71b8f324ad88ff38b077ba1763c163f9d80a30fa
Colin Cross [Thu, 7 Jul 2016 18:16:49 +0000 (11:16 -0700)]
Support LOCAL_STRIP_MODULE := keep_symbols for prebuilts
Change-Id: I92a838b07fe4116d5a4b8521fe1ce8d44e6e84e2
Treehugger Robot [Thu, 7 Jul 2016 18:07:21 +0000 (18:07 +0000)]
Merge "Recognize new C/C++ compiler and static analyzer warnings."
Alex Klyubin [Thu, 7 Jul 2016 16:32:28 +0000 (09:32 -0700)]
Move apksigner library to tools/apksig.
This moves build/tools/apksigner/core to its own project tools/apksig.
The move also renames the moved Java packages from
com.android.apksigner.core.* to com.android.apksig.* to reflect the
new name of the library.
Bug:
27461702
Change-Id: Iab812ae2b8f0a741014f842460c78e35bc249d43
Dan Willemsen [Thu, 7 Jul 2016 17:20:45 +0000 (17:20 +0000)]
Merge \\"Never add asan libraries to NDK code\\" am:
59a405c831
am:
83de5d619a
Change-Id: Idbc5a8016d8ea02a7c960f350b411814b67e6c2e
Dan Willemsen [Thu, 7 Jul 2016 17:17:44 +0000 (17:17 +0000)]
Merge \"Never add asan libraries to NDK code\"
am:
59a405c831
Change-Id: I6e6129204efe2478c5f7ff6ea0bf04e81203c113
Dan Willemsen [Thu, 7 Jul 2016 17:07:42 +0000 (17:07 +0000)]
Merge "Never add asan libraries to NDK code"
Alex Klyubin [Wed, 6 Jul 2016 23:16:52 +0000 (23:16 +0000)]
Merge \\"APK signer primitive.\\" am:
d81beca2b2
am:
69c8c38f63
Change-Id: I296cabea0366e48f1ddaa7abcc189a74b90e529d
Alex Klyubin [Wed, 6 Jul 2016 23:14:09 +0000 (23:14 +0000)]
Merge \"APK signer primitive.\"
am:
d81beca2b2
Change-Id: I9570df7b5f7a70b4fdd04cbbdeae80d3e5bf9616
Treehugger Robot [Wed, 6 Jul 2016 22:59:32 +0000 (22:59 +0000)]
Merge "APK signer primitive."
Chih-Hung Hsieh [Fri, 1 Jul 2016 22:48:06 +0000 (15:48 -0700)]
Recognize new C/C++ compiler and static analyzer warnings.
Change-Id: I5f47c45498c640702922704aa5305a85e9493fcc
Test: run with Android build.log.
David Friedman [Fri, 1 Jul 2016 22:37:09 +0000 (22:37 +0000)]
Merge \"Docs: Adding info in support of TOC for new Performance section.\" into nyc-dev
am:
77a4215191
Change-Id: I83cd35ea59fd61d9aeac5961a98970531c68278c
Joe Fernandez [Fri, 1 Jul 2016 22:18:19 +0000 (22:18 +0000)]
Merge "Docs: Adding info in support of TOC for new Performance section." into nyc-dev
Evgenii Stepanov [Fri, 1 Jul 2016 20:27:43 +0000 (20:27 +0000)]
Merge \\"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\\" am:
997a6cd1a1
am:
9223ab05ae
Change-Id: Idd26e5a3e33b0875fb0fec2541a3d47c04bf9c34
Evgenii Stepanov [Fri, 1 Jul 2016 20:22:41 +0000 (20:22 +0000)]
Merge \"Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.\"
am:
997a6cd1a1
Change-Id: Ic8bc436901efd0b8ba099d68b61faa46a8d503fd
Evgenii Stepanov [Fri, 1 Jul 2016 20:22:37 +0000 (20:22 +0000)]
Merge \\"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\\" am:
9c88e0bfa2
am:
120112ee23
Change-Id: I126d080bf84cf049d6f7f8de1881e4f89e057561
Evgenii Stepanov [Fri, 1 Jul 2016 20:17:39 +0000 (20:17 +0000)]
Merge \"Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.\"
am:
9c88e0bfa2
Change-Id: I828de48b2f552801ec83c11f493eaaacb5f83e47
Evgenii Stepanov [Fri, 1 Jul 2016 20:09:45 +0000 (20:09 +0000)]
Merge "Apply SANITIZE_TARGET=safe-stack to 64 bit targets only."
Evgenii Stepanov [Sat, 7 May 2016 01:15:57 +0000 (18:15 -0700)]
Apply SANITIZE_TARGET=safe-stack to 64 bit targets only.
Bug:
27729263
Change-Id: I214a9f40b94f6e6716aca05be774f014e62f73e8
Evgenii Stepanov [Fri, 1 Jul 2016 20:07:04 +0000 (20:07 +0000)]
Merge "Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present."
Evgenii Stepanov [Fri, 20 May 2016 00:45:21 +0000 (17:45 -0700)]
Apply SANITIZE_TARGET and LOCAL_SANITIZE when both are present.
The idea is that targets with LOCAL_SANITIZE = signed-integer-overflow
and SANITIZE_TARGET=safe-stack should get both sanitizers.
This should work just fine for SANITIZE_TARGET=address, too.
Bug:
27729263
Change-Id: Ifee350da4877008fb061bc7f6c700e7fade405bc
Andreas Gampe [Fri, 1 Jul 2016 04:53:32 +0000 (04:53 +0000)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
am:
ae492fd5f2
Change-Id: I8b0a27b2cf9a3179b097765a4c360c0a61c1ff21
Andreas Gampe [Fri, 1 Jul 2016 04:42:44 +0000 (21:42 -0700)]
resolve merge conflicts of
9d73af0 to stage-aosp-master
Change-Id: I984c48310e72cb509b859501cfb07258214038fa
Andreas Gampe [Fri, 1 Jul 2016 04:37:36 +0000 (04:37 +0000)]
Merge \\"Build: Fix vendor sanitizer library for secondary arch\\" am:
2302a76966
am:
80b32402dc
Change-Id: I6b59928b0d37aadbc29b9162521340062ec7d979
Andreas Gampe [Fri, 1 Jul 2016 04:33:43 +0000 (04:33 +0000)]
Merge \"Build: Fix vendor sanitizer library for secondary arch\"
am:
2302a76966
Change-Id: I2b21579df22b08655cdc9eab2d570304b167b5b6
Treehugger Robot [Fri, 1 Jul 2016 04:26:26 +0000 (04:26 +0000)]
Merge changes I17a96b97,Ib4412657,I73e6d479
* changes:
Build: Add module-level product configuration of sanitization
Build: Add option to restrict sanitization by owner
Build: Add option to restrict sanitization by architecture
Treehugger Robot [Fri, 1 Jul 2016 04:24:46 +0000 (04:24 +0000)]
Merge "Build: Fix vendor sanitizer library for secondary arch"
Andreas Gampe [Fri, 1 Jul 2016 03:20:38 +0000 (20:20 -0700)]
Build: Fix vendor sanitizer library for secondary arch
Fix the directory for secondary-architecture libraries under
sanitization. These incorrectly wrote into vendor/lib instead
of data/vendor/lib.
Bug:
29498013
Change-Id: Iee08422a1f7ad42cbe71a322347e98cb74e3ef7f
Evgenii Stepanov [Fri, 1 Jul 2016 00:51:33 +0000 (00:51 +0000)]
Merge \\"Sanitizer build tweaks.\\" am:
24dc27e643
am:
bd9f3f6187
Change-Id: I2383d305625a872c7ec44ce594c30bd5c17c2983
Evgenii Stepanov [Fri, 1 Jul 2016 00:47:39 +0000 (00:47 +0000)]
Merge \"Sanitizer build tweaks.\"
am:
24dc27e643
Change-Id: I351ba996ee3ed77f6400e48149c972e271476a8f
Evgenii Stepanov [Fri, 1 Jul 2016 00:42:12 +0000 (00:42 +0000)]
Merge "Sanitizer build tweaks."
Evgenii Stepanov [Fri, 20 May 2016 00:49:51 +0000 (17:49 -0700)]
Sanitizer build tweaks.
-Wl,-no-undefined is currently disabled for any SANITIZE_TARGET. Limit that to
the sanitizers with a runtime library (i.e. address, thread).
Re-enable the relocation packer for ASan. This has been fixed upstream a long
time ago.
Bug:
27729263
Change-Id: I566df6104de816223dc1c519d41a87629ce9c47c
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:05 +0000 (23:54 +0000)]
Merge \\"Only add libdl dependency for ASan/TSan on target.\\" am:
3d8ee8896b
am:
2890414f78
Change-Id: I77a1824ebd28ad05ff635744e71e65259bf1e8f4
Evgenii Stepanov [Thu, 30 Jun 2016 23:54:04 +0000 (23:54 +0000)]
resolve merge conflicts of
ff3341b to stage-aosp-master
am:
e6350dfddd
Change-Id: If8afcbb7b2734866b1e0ed26760c1cc1fe235634
Evgenii Stepanov [Thu, 30 Jun 2016 23:50:50 +0000 (23:50 +0000)]
Merge \"Only add libdl dependency for ASan/TSan on target.\"
am:
3d8ee8896b
Change-Id: I97e2daed8c10a325e27969c2fcaac1848dfefa80
Evgenii Stepanov [Thu, 30 Jun 2016 23:49:26 +0000 (23:49 +0000)]
Merge "Only add libdl dependency for ASan/TSan on target."
Evgenii Stepanov [Thu, 12 May 2016 20:07:36 +0000 (13:07 -0700)]
Only add libdl dependency for ASan/TSan on target.
Only sanitizers that intercept stuff need that. For example,
SafeStack does not, and I think UBSan too.
Bug:
27729263
Change-Id: I413cd46cc6c6914a363a3c53da7954beacd8f0d8
Evgenii Stepanov [Thu, 30 Jun 2016 23:34:49 +0000 (16:34 -0700)]
resolve merge conflicts of
ff3341b to stage-aosp-master
Change-Id: I1883410889b8e6c6505042fcebca6c8764e15e9a
Andreas Gampe [Mon, 27 Jun 2016 22:15:31 +0000 (15:15 -0700)]
Build: Add module-level product configuration of sanitization
To allow special sanitizer settings for modules shared between
products, add product-specific module settings.
This was copied from the product-specific dexopt settings.
Bug:
29498013
Change-Id: I17a96b975bb6ac7f4ffb3d5b08e2f00b21bd97a1
(cherry picked from commit
bb5454b6db5770f0b0275424148b2d7d3c52a56d)
Andreas Gampe [Tue, 21 Jun 2016 00:46:29 +0000 (17:46 -0700)]
Build: Add option to restrict sanitization by owner
Add Make variable SANITIZE_NEVER_BY_OWNER to selectively
sanitize modules. By default, both are being sanitized. The
value of the variable is interpreted as a space or colon
separated list of owner names.
This can be used to create builds that lower the sanitization
burden by not sanitizing parts of the platform.
Bug:
29498013
Change-Id: Ib4412657fd38ff28a5c0863eddc2acde63c88ebb
(cherry picked from commit
ea38d8e95d7daea49cc2a528d69e06a0005b31a6)
Andreas Gampe [Tue, 21 Jun 2016 00:36:49 +0000 (17:36 -0700)]
Build: Add option to restrict sanitization by architecture
Add Make variable SANITIZE_ARCH to selectively sanitize binaries.
This uses the "bitness," i.e., 32 or 64, to potentially filter
the sanitization. By default, both are being sanitized.
This can be used to create builds that lower the sanitization
burden by not sanitizing "half" of the platform.
Bug:
29498013
Change-Id: I73e6d479f08a970ba912f4f63967d32f3487125f
(cherry picked from commit
0290a416c844f9a8ec953f63f199b00d36283228)
Evgenii Stepanov [Thu, 30 Jun 2016 22:49:52 +0000 (22:49 +0000)]
Merge "Add LOCAL_NOSANITIZE."
Evgenii Stepanov [Thu, 12 May 2016 20:07:17 +0000 (13:07 -0700)]
Add LOCAL_NOSANITIZE.
This can be used to selectively disable individual sanitizers on a
target. For example, some parts of libc should be built with
SafeStack (when requested with SANITIZE_TARGET), but never with
AddressSanitizer. Current build rules specify LOCAL_SANITIZE := never
to disable AddressSanitizer; the idea is to change that to
LOCAL_NOSANITIZE := address thread.
Bug:
27729263
Change-Id: I2b770f2ce3faf6ad6798792327e96adb86fe4a4f
Dan Willemsen [Wed, 29 Jun 2016 20:45:21 +0000 (20:45 +0000)]
Merge \\"Detect \\`uname -m\\` == i686 as a 32-bit host\\" am:
55d4a46f6d
am:
db9f3489bc
Change-Id: Ia6e75590c95a7e670f977a33b540b76f8b995af8
Dan Willemsen [Wed, 29 Jun 2016 20:39:42 +0000 (20:39 +0000)]
Merge \"Detect \`uname -m\` == i686 as a 32-bit host\"
am:
55d4a46f6d
Change-Id: Ia66952b98541755c55df1eb98775d749d2155dc1
Treehugger Robot [Wed, 29 Jun 2016 20:37:13 +0000 (20:37 +0000)]
Merge "Detect `uname -m` == i686 as a 32-bit host"
Dan Willemsen [Wed, 29 Jun 2016 19:26:53 +0000 (12:26 -0700)]
Detect `uname -m` == i686 as a 32-bit host
Change-Id: I0350629ce6ea7a5f0224489bafc98bc190e70932
Test: UNAME from https://groups.google.com/d/msg/android-building/nGQna2xuW5s/eEcXSo9ZBgAJ
Tianjie Xu [Wed, 29 Jun 2016 18:48:29 +0000 (18:48 +0000)]
Merge \\"Skip copying existing vendor images\\" am:
1767d3f918
am:
85da4d3566
Change-Id: I3d5ff34f134f674cbec66978385ad3936e9c119d
Tianjie Xu [Wed, 29 Jun 2016 18:45:57 +0000 (18:45 +0000)]
Merge \"Skip copying existing vendor images\"
am:
1767d3f918
Change-Id: I5f929adedb17b6d32d2e0e284aa37c39c643c3ea
Tianjie Xu [Wed, 29 Jun 2016 18:37:38 +0000 (18:37 +0000)]
Merge "Skip copying existing vendor images"
Tianjie Xu [Tue, 28 Jun 2016 21:34:03 +0000 (14:34 -0700)]
Skip copying existing vendor images
add_img_to_target_files.py has an option of "-a" to add missing
images only. Under this option, the script should skip copying
the radio images for A/B devices when given image exists already
under "IMAGES/".
Test: Run the command on an A/B device, the existing radio images under "IMAGES/" don't get overwritten; and missing images are added correctly.
Bug:
29608905
Change-Id: Ie034b85a5d777d53e367f99470cea4d19cb1aaaf
Yi Kong [Wed, 29 Jun 2016 11:11:49 +0000 (11:11 +0000)]
Merge \\"Add jdk.net to whitelist\\" am:
d2f4cbbf88
am:
09d7992067
Change-Id: I8f76af8ade472df24a7adaee133106cd6c54c2c3
Yi Kong [Wed, 29 Jun 2016 11:06:23 +0000 (11:06 +0000)]
Merge \"Add jdk.net to whitelist\"
am:
d2f4cbbf88
Change-Id: I80f7f529659953fd5664211e2a779d09e2245d34
Yi Kong [Wed, 29 Jun 2016 11:00:47 +0000 (11:00 +0000)]
Merge "Add jdk.net to whitelist"
Dan Willemsen [Tue, 28 Jun 2016 23:47:43 +0000 (16:47 -0700)]
Never add asan libraries to NDK code
We're beginning to enforce (still warning) that NDK code only links to
other NDK code. So we should never need to link them to the address
sanitizer libraries.
This breaks down a bit when platform code starts depending on NDK-built
code, where the NDK-built code should be mostly the same as if it was
built with the platform, but has an implicit LOCAL_SANITIZE := never.
Even so, this change shouldn't make that worse, as we'll still compile
fine, and anything platform code that uses asan should pull in the
shared library.
Change-Id: I81b30b9edd971468c3cb1467f809f184807b505e
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:42:47 +0000 (23:42 +0000)]
Merge \\"Extract public key ID from cert\\" am:
606ad22def
am:
45373976b1
Change-Id: I2d1d174d25aee419cd666ad9a69a8a590645af42
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:40:22 +0000 (23:40 +0000)]
Merge \"Extract public key ID from cert\"
am:
606ad22def
Change-Id: Idfc1ff8ec8766d4b15a5b1908a8eb830e28b42f3
Badhri Jagan Sridharan [Tue, 28 Jun 2016 23:36:22 +0000 (23:36 +0000)]
Merge "Extract public key ID from cert"
Badhri Jagan Sridharan [Sat, 30 Apr 2016 01:20:13 +0000 (18:20 -0700)]
Extract public key ID from cert
Extracts keyid inline using openssl commands.
The keyid is passed as one of the kernel command line parameters
for the dm-android-verity module to mount root fs(system)
with verity enabled.
(cherry-picked from
3af315aed5d657942b28ccae342324b9ee90116d
https://googleplex-android-review.git.corp.google.com/#/c/
1061691/)
BUG:
28384658
Change-Id: I8efbe1b0e415ef1d396f9b51cfa4b3fa01b22484
Dan Willemsen [Tue, 28 Jun 2016 19:51:00 +0000 (19:51 +0000)]
Merge \\"Turn unused source files from warning to error\\" am:
73609480b3
am:
90f03ecfee
Change-Id: Ib350a58be93424cba2d9c18a55c40fce12af852e
Dan Willemsen [Tue, 28 Jun 2016 19:48:32 +0000 (19:48 +0000)]
Merge \"Turn unused source files from warning to error\"
am:
73609480b3
Change-Id: Iddedac74a78968eb438bddae1e22633ba8c13375
Treehugger Robot [Tue, 28 Jun 2016 19:41:39 +0000 (19:41 +0000)]
Merge "Turn unused source files from warning to error"
Allen Hair [Tue, 28 Jun 2016 18:25:43 +0000 (18:25 +0000)]
Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev
am:
1f44c26b1e -s ours
Change-Id: I2c7de4484b78f31d83ae04c8e3c591e22d222689
Allen Hair [Tue, 28 Jun 2016 17:45:17 +0000 (17:45 +0000)]
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
Dan Willemsen [Tue, 28 Jun 2016 17:22:08 +0000 (10:22 -0700)]
Turn unused source files from warning to error
All instances have disappeared from the build server, so switch this to
error before more turn up.
Change-Id: Iac07526a6e77ebf33733033249f2a108aae3fa7d
Hung-ying Tyan [Tue, 28 Jun 2016 06:24:48 +0000 (06:24 +0000)]
Merge \\"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\\" am:
2acb2d5bcf
am:
200da242a5
Change-Id: I93d1b301c23265e783e68de5e066606764b90ffc
Hung-ying Tyan [Tue, 28 Jun 2016 06:22:17 +0000 (06:22 +0000)]
Merge \"Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES\"
am:
2acb2d5bcf
Change-Id: I3c151949bcc6b8d75f2c46619b6ce38561084338
Treehugger Robot [Tue, 28 Jun 2016 06:17:32 +0000 (06:17 +0000)]
Merge "Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES"
Hung-ying Tyan [Fri, 20 May 2016 11:08:30 +0000 (19:08 +0800)]
Add VENDOR_PRODUCT_RESTRICT_VENDOR_FILES
Allow exceptions specified by module (VENDOR_EXCEPTION_MODULES) and
path (VENDOR_EXCEPTION_PATHS, not including leading vendor/).
BUG=
26968426
Change-Id: I068e43f3eae14f8793c33ae916d46979ab1681d1
Ethan Xia [Tue, 28 Jun 2016 01:59:47 +0000 (01:59 +0000)]
Merge \\"releasetools: Change the default key path for bvbtool\\" am:
7c7571d510
am:
090e8eff5e
Change-Id: I34f3cc1a38b860fd3100548f55a38af9faf69e19
Ethan Xia [Tue, 28 Jun 2016 01:57:26 +0000 (01:57 +0000)]
Merge \"releasetools: Change the default key path for bvbtool\"
am:
7c7571d510
Change-Id: Ic02f432c689edba37ecce684662d8f5f1cfc32b6
Treehugger Robot [Tue, 28 Jun 2016 01:52:36 +0000 (01:52 +0000)]
Merge "releasetools: Change the default key path for bvbtool"
Allen Hair [Mon, 27 Jun 2016 19:32:50 +0000 (12:32 -0700)]
DO NOT MERGE Skip emma instrumentation if we're using jack.
Bug:
29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
David Friedman [Mon, 27 Jun 2016 23:40:20 +0000 (16:40 -0700)]
Docs: Adding info in support of TOC for new Performance section.
Bug:
Change-Id: Iad34b8d3294ddea714c8933a60fb2615811ac019
Alex Klyubin [Wed, 22 Jun 2016 21:03:06 +0000 (14:03 -0700)]
APK signer primitive.
This adds an APK signer primitive which preserves as much of the input
APK as possible. For example, it preserves the order of APK entries
and preserves their contents, including compressed form and alignment
of data.
Bug:
27461702
Change-Id: I51d07c530480182a66379e70a00f680544ff6214
Ethan Xia [Mon, 27 Jun 2016 09:19:01 +0000 (17:19 +0800)]
releasetools: Change the default key path for bvbtool
The bvb path has been changed from 'system/bvb' to 'external/bvb'
Change-Id: I8587351b7d702a287883c6bd3c9de1cd3540435b