OSDN Git Service
The Android Automerger [Sun, 14 Feb 2016 08:00:41 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Jeff Tinker [Sat, 13 Feb 2016 08:08:33 +0000 (08:08 +0000)]
Merge "Add mediadrm service" into nyc-dev
The Android Automerger [Fri, 12 Feb 2016 22:01:06 +0000 (14:01 -0800)]
"NRC42E"
Jeff Tinker [Fri, 12 Feb 2016 17:00:49 +0000 (09:00 -0800)]
Add mediadrm service
Part of media security hardening
This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.
bug:
22990512
Change-Id: I9fecb59158d560201f64721cdc026f5604cc3945
The Android Automerger [Fri, 12 Feb 2016 16:28:19 +0000 (08:28 -0800)]
"NRC42D"
The Android Automerger [Fri, 12 Feb 2016 02:38:10 +0000 (18:38 -0800)]
"NRC42C"
Aurimas Liutikas [Fri, 12 Feb 2016 02:11:21 +0000 (18:11 -0800)]
Fix 2 unused parameter warnings in zipalign.
ZipFile parameter was not used and therefore can be removed.
Bug:
26936282
Change-Id: Id2b6e693b40571b7e7486304a6effaedc1b3c940
The Android Automerger [Thu, 11 Feb 2016 21:45:54 +0000 (13:45 -0800)]
"NRC42B"
Tao Bao [Thu, 11 Feb 2016 17:50:41 +0000 (09:50 -0800)]
Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.
[1] commit
ab5bd668f6be600a8cceb8772e426c0aa902a5e1
Bug:
27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
Alex Klyubin [Thu, 11 Feb 2016 18:50:12 +0000 (18:50 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." into nyc-dev
Tao Bao [Thu, 11 Feb 2016 17:50:41 +0000 (09:50 -0800)]
Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.
[1] commit
ab5bd668f6be600a8cceb8772e426c0aa902a5e1
Bug:
27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
Sebastien Hertz [Thu, 11 Feb 2016 09:49:07 +0000 (09:49 +0000)]
Merge "Remove usages of jill.jar, use jack instead" into nyc-dev
The Android Automerger [Thu, 11 Feb 2016 08:04:29 +0000 (00:04 -0800)]
"NRC42"
The Android Automerger [Thu, 11 Feb 2016 08:00:20 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
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
c2c49ed0c13846f7f96249c7419971dfcddc9215).
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
2cfd1d108c82bdedccb03917e09aa5e677e8fde2)
Change-Id: I38450d07ddc05c705de40313f843beada8db7d98
The Android Automerger [Thu, 11 Feb 2016 00:24:03 +0000 (16:24 -0800)]
"NRC41C"
The Android Automerger [Wed, 10 Feb 2016 20:01:44 +0000 (12:01 -0800)]
"NRC41B"
Sami Tolvanen [Tue, 9 Feb 2016 20:28:58 +0000 (12:28 -0800)]
Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.
Bug:
27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
(cherry picked from commit
6a8781a25113b9b49dddc8c8e043c27d5a943e3a)
Alex Klyubin [Wed, 10 Feb 2016 18:15:26 +0000 (18:15 +0000)]
Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." into nyc-dev
Tao Bao [Thu, 4 Feb 2016 22:26:02 +0000 (14:26 -0800)]
releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.
Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).
Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).
Bug:
26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
(cherry picked from commit
d8d14bec0d9fb604060634729b4a09c7898d0c9a)
Tao Bao [Wed, 10 Feb 2016 17:36:59 +0000 (17:36 +0000)]
Merge "improve performance of blockimgdiff" into nyc-dev
Doug Zongker [Tue, 9 Feb 2016 16:28:09 +0000 (08:28 -0800)]
improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images. GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition. FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.
Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
(cherry picked from commit
2d2dd1526dba2f9b533c4e0f2655524fea2cca4d)
Yohann Roussel [Tue, 19 Jan 2016 15:08:34 +0000 (16:08 +0100)]
Remove usages of jill.jar, use jack instead
Bug:
27113650
(cherry picked from commit
d0bb7bdf5a62fd1cd0469e0b5d6b54feaecb3cdd)
Change-Id: I218ed2bda032b00bee4c52994a0aadce6d699133
Alex Klyubin [Tue, 9 Feb 2016 21:09:57 +0000 (13:09 -0800)]
Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to
6c41036bcf35fe39162b50d27533f0f3bfab3028 where
I forgot to update a section of OTA update ZIP code.
Bug:
26864066
(cherry picked from commit
f735851fa95ea7b372ab4245a7b583667efb4ea9)
Change-Id: I4f85ce170ac72d13a9c8636414927a295e350458
The Android Automerger [Wed, 10 Feb 2016 08:03:26 +0000 (00:03 -0800)]
"NRC41"
The Android Automerger [Wed, 10 Feb 2016 08:00:28 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
Marco Nelissen [Wed, 10 Feb 2016 05:46:33 +0000 (05:46 +0000)]
Merge "Add mediacodec binary for codec process" into nyc-dev
The Android Automerger [Wed, 10 Feb 2016 00:27:53 +0000 (16:27 -0800)]
"NRC40C"
Patrick Tjin [Tue, 9 Feb 2016 23:40:38 +0000 (15:40 -0800)]
Add compressor options for squashfs vendor images
Change-Id: I4f9f5d62e24654cb37d436cb73dd5893aed30fa8
Patrick Tjin [Tue, 9 Feb 2016 22:12:47 +0000 (14:12 -0800)]
Allow squashfs for vendor image only
Previously, the squashfs dependencies were included only if
the system image was squashfs. Allow the vendor image trigger
the dependency.
Change-Id: I5b1c513e9c13d83efc3ca6a904f08a91d9cca85f
The Android Automerger [Tue, 9 Feb 2016 20:53:17 +0000 (12:53 -0800)]
"NRC40B"
The Android Automerger [Tue, 9 Feb 2016 08:03:41 +0000 (00:03 -0800)]
"NRC40"
The Android Automerger [Tue, 9 Feb 2016 08:00:30 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 8 Feb 2016 22:15:32 +0000 (14:15 -0800)]
"NRC39B"
Marco Nelissen [Wed, 3 Feb 2016 00:13:16 +0000 (16:13 -0800)]
Add mediacodec binary for codec process
Bug:
22775369
Change-Id: If8087fd289968a6eb09a7f038243447ade5dd9d3
The Android Automerger [Mon, 8 Feb 2016 08:01:22 +0000 (00:01 -0800)]
"NRC39"
The Android Automerger [Mon, 8 Feb 2016 08:00:16 +0000 (00:00 -0800)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 7 Feb 2016 08:05:02 +0000 (00:05 -0800)]
"NRC38"
The Android Automerger [Sun, 7 Feb 2016 08:00:45 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Alex Deymo [Fri, 5 Feb 2016 23:43:38 +0000 (23:43 +0000)]
Merge "ota_from_target_files: Include the payload properties." am:
db82f72752
am:
07085a5113
* commit '
07085a511385a9dfa71414735641f96119ec342c':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:16:47 +0000 (23:16 +0000)]
Merge "ota_from_target_files: Include the payload properties."
am:
db82f72752
* commit '
db82f72752532bf2b98103171b3d7cd8405b88e4':
ota_from_target_files: Include the payload properties.
Alex Deymo [Fri, 5 Feb 2016 23:11:18 +0000 (23:11 +0000)]
Merge "ota_from_target_files: Include the payload properties."
Dan Willemsen [Fri, 5 Feb 2016 18:20:34 +0000 (18:20 +0000)]
Merge "Fix unused src tracking for generated .o files" am:
478913f88f
am:
d02bb7bfc5
* commit '
d02bb7bfc51343ab88eb2e05157155673ddf8130':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:18:20 +0000 (18:18 +0000)]
Merge "Fix unused src tracking for generated .o files"
am:
478913f88f
* commit '
478913f88fdafc61015e87129486e12ddeb7d184':
Fix unused src tracking for generated .o files
Dan Willemsen [Fri, 5 Feb 2016 18:12:20 +0000 (18:12 +0000)]
Merge "Fix unused src tracking for generated .o files"
Alex Deymo [Fri, 5 Feb 2016 06:29:29 +0000 (22:29 -0800)]
ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.
Bug:
26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.
Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
The Android Automerger [Fri, 5 Feb 2016 00:21:28 +0000 (16:21 -0800)]
"NRC35C"
Colin Cross [Fri, 5 Feb 2016 00:04:43 +0000 (00:04 +0000)]
Merge "Don\'t build otatools for PDK" am:
9e8866f4a4
am:
3611f2f440
* commit '
3611f2f440944dadd74b36a235c41c7957a6963c':
Don't build otatools for PDK
Colin Cross [Fri, 5 Feb 2016 00:01:49 +0000 (00:01 +0000)]
Merge "Don\'t build otatools for PDK"
am:
9e8866f4a4
* commit '
9e8866f4a4ec60778d55366afaf29f7d2e22e9ee':
Don't build otatools for PDK
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
Chih-Hung Hsieh [Thu, 4 Feb 2016 23:43:05 +0000 (15:43 -0800)]
resolve merge conflicts of
dc1afa9c0f to master.
Change-Id: I4236d9f79cbca689d0fcc400d4c10a663209bc2a
Chih-hung Hsieh [Thu, 4 Feb 2016 23:29:24 +0000 (23:29 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
am:
9ff17cf7bc
* commit '
9ff17cf7bcc4b88a6a407f0c573b181a91f30ec8':
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Chih-hung Hsieh [Thu, 4 Feb 2016 23:22:19 +0000 (23:22 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
Colin Cross [Thu, 4 Feb 2016 23:19:16 +0000 (23:19 +0000)]
Merge "Build .toc when building a module by name" am:
1b21a15049
am:
af5b95ac90
* commit '
af5b95ac90ae06cf9efc52436e2e24d8c55541ce':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:17:20 +0000 (23:17 +0000)]
Merge "Build .toc when building a module by name"
am:
1b21a15049
* commit '
1b21a1504952addbfef585d91afd2fddc5cf29ae':
Build .toc when building a module by name
Colin Cross [Thu, 4 Feb 2016 23:13:31 +0000 (23:13 +0000)]
Merge "Build .toc when building a module by name"
Colin Cross [Thu, 4 Feb 2016 23:09:23 +0000 (15:09 -0800)]
Don't build otatools for PDK
Change-Id: I5e73d103300ac938f80b3ff0af978c123d649fed
The Android Automerger [Thu, 4 Feb 2016 22:36:59 +0000 (14:36 -0800)]
"NRC35B"
Dan Willemsen [Thu, 4 Feb 2016 22:18:48 +0000 (14:18 -0800)]
Fix unused src tracking for generated .o files
*.o files that are passed in via LOCAL_GENERATED_SOURCES are added
directly to all_objects, they are not mixed with the normal_objects that
we track. So omit them from they my_gen_src_files list so that we don't
warn that they're unused.
Change-Id: I94b85504032e70fbcc00207d6200557700dd0a89
Colin Cross [Thu, 4 Feb 2016 21:28:04 +0000 (13:28 -0800)]
Build .toc when building a module by name
Building a module by name with make <module name>, or with mm or mma
through all_modules, should also build the .toc file so that future uses
of mm on modules that depend on this one can find the .toc file.
Bug:
26936761
Change-Id: Id0c592f0860a10b732b2b5b13c7e967c9bcb1c6b
Stephen Hines [Thu, 4 Feb 2016 19:52:45 +0000 (19:52 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts." am:
042d589fa2
am:
1972757ef8
* commit '
1972757ef8e4de53b3400e62a1711c52eecd0a2b':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:50:04 +0000 (19:50 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
am:
042d589fa2
* commit '
042d589fa247a7d8fdb94043598cd04cf6857ca0':
Fix LLVM_RTLIB_PATH for new prebuilts.
Stephen Hines [Thu, 4 Feb 2016 19:46:07 +0000 (19:46 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
Stephen Hines [Thu, 4 Feb 2016 19:43:41 +0000 (11:43 -0800)]
Fix LLVM_RTLIB_PATH for new prebuilts.
This moved from lib/ to lib64/, but wasn't noticed because no one builds
with the profiler on by default.
Change-Id: I0155263b4a50437ea0864338fb34baefc3df59d2
Chih-Hung Hsieh [Thu, 4 Feb 2016 18:55:56 +0000 (10:55 -0800)]
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Use global default USE_CLANG_PLATFORM_BUILD set in core/envsetup.mk,
or user provided environment variable USE_CLANG_PLATFORM_BUILD.
BUG:
26102335
Change-Id: I7e12219a60f36bb44797bb028b4a5873a67c9210
The Android Automerger [Thu, 4 Feb 2016 08:03:12 +0000 (00:03 -0800)]
"NRC35"
The Android Automerger [Thu, 4 Feb 2016 08:00:33 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Stephen Hines [Thu, 4 Feb 2016 07:40:23 +0000 (07:40 +0000)]
Stephen Hines [Thu, 4 Feb 2016 07:38:36 +0000 (07:38 +0000)]
Stephen Hines [Thu, 4 Feb 2016 07:34:05 +0000 (07:34 +0000)]
Merge "Switch to clang-
2577113."
Mathieu Chartier [Wed, 3 Feb 2016 22:14:14 +0000 (22:14 +0000)]
Merge "Add default app image format property"
The Android Automerger [Wed, 3 Feb 2016 21:02:47 +0000 (13:02 -0800)]
"NRC34B"
Dan Willemsen [Wed, 3 Feb 2016 19:05:09 +0000 (19:05 +0000)]
Merge changes I2e00bb66,I00890229 am:
6c597e6bdd
am:
11b5b1c992
* commit '
11b5b1c9925acf80dd42a184e92870d6bfa54736':
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 19:02:54 +0000 (19:02 +0000)]
Merge changes I2e00bb66,I00890229
am:
6c597e6bdd
* commit '
6c597e6bdd6f3ba9d0ab0fbad43cd7746e34ed86':
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 18:57:07 +0000 (18:57 +0000)]
Merge changes I2e00bb66,I00890229
* changes:
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 18:46:39 +0000 (10:46 -0800)]
Do not diff .odex files
They still are not deterministic -- only the boot images were made
deterministic (.oat/.art).
Bug:
26956807
Change-Id: I2e00bb6662b4c8d184c48ef9aa34b39142c94893
Dan Willemsen [Wed, 3 Feb 2016 18:45:25 +0000 (10:45 -0800)]
Diff libpac.so now that it is deterministic
Bug:
25348136
Change-Id: I008902299281b5ddd55a9b8c405d53eea2d56c8b
Neil Fuller [Wed, 3 Feb 2016 15:37:26 +0000 (15:37 +0000)]
Merge "Add new package: java.util.function"
The Android Automerger [Wed, 3 Feb 2016 08:03:42 +0000 (00:03 -0800)]
"NRC34"
The Android Automerger [Wed, 3 Feb 2016 08:00:21 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 23:06:40 +0000 (15:06 -0800)]
"NRC33B"
Colin Cross [Tue, 2 Feb 2016 20:40:49 +0000 (20:40 +0000)]
Merge "Move PDK selection into config.mk" am:
655dd3ea76
am:
3f238d8cda
* commit '
3f238d8cda78990a90509206ccd60db7a2f0945a':
Move PDK selection into config.mk
Colin Cross [Tue, 2 Feb 2016 20:38:22 +0000 (20:38 +0000)]
Merge "Move PDK selection into config.mk"
am:
655dd3ea76
* commit '
655dd3ea769c8482821cdda7b0eec80c5a500b17':
Move PDK selection into config.mk
Colin Cross [Tue, 2 Feb 2016 20:34:30 +0000 (20:34 +0000)]
Merge "Move PDK selection into config.mk"
Dan Willemsen [Tue, 2 Feb 2016 18:04:40 +0000 (18:04 +0000)]
Dan Willemsen [Tue, 2 Feb 2016 18:01:46 +0000 (18:01 +0000)]
Dan Willemsen [Tue, 2 Feb 2016 17:56:57 +0000 (17:56 +0000)]
Merge "Fix typo"
Maria Garcia Puyol [Tue, 2 Feb 2016 17:10:34 +0000 (17:10 +0000)]
Merge "Add EmergencyInfo to devices with telephony"
The Android Automerger [Tue, 2 Feb 2016 16:40:01 +0000 (08:40 -0800)]
merge in nyc-release history after reset to master
The Android Automerger [Tue, 2 Feb 2016 15:41:58 +0000 (07:41 -0800)]
"NRC28F"
The Android Automerger [Tue, 2 Feb 2016 15:27:41 +0000 (07:27 -0800)]
merge in nyc-release history after reset to master
Sebastien Hertz [Tue, 2 Feb 2016 09:13:57 +0000 (09:13 +0000)]
Merge "Support code coverage with Jack" am:
4dad88980f
am:
7b02e64148
* commit '
7b02e64148e6a1c0355d715b2a8034061f0d2837':
Support code coverage with Jack
Dan Willemsen [Tue, 2 Feb 2016 09:13:48 +0000 (09:13 +0000)]
Merge "Track ObjC object mapping" am:
fedafc879d
am:
d3212f55c3
* commit '
d3212f55c3ee2b762144089a932e8995519b0a57':
Track ObjC object mapping
The Android Automerger [Tue, 2 Feb 2016 08:02:33 +0000 (00:02 -0800)]
"NRC33"
The Android Automerger [Tue, 2 Feb 2016 08:00:19 +0000 (00:00 -0800)]
merge in nyc-release history after reset to master
Stephen Hines [Fri, 22 Jan 2016 23:12:49 +0000 (15:12 -0800)]
Switch to clang-
2577113.
Bug: http://b/
25282907
This is actually based on clang/LLVM upstream revision r256229.
Change-Id: I335be68f196e5b55ac2816fa854e97b841b54240
Sebastien Hertz [Tue, 2 Feb 2016 07:34:59 +0000 (07:34 +0000)]
Merge "Support code coverage with Jack"
am:
4dad88980f
* commit '
4dad88980f49f40fb13ab57659c1016e12ca0cb9':
Support code coverage with Jack
Sebastien Hertz [Tue, 2 Feb 2016 07:31:37 +0000 (07:31 +0000)]
Merge "Support code coverage with Jack"
Dan Willemsen [Tue, 2 Feb 2016 05:40:17 +0000 (21:40 -0800)]
Fix typo
This was producing a number of unused source warnings for prebuilt files
using LOCAL_SRC_FILES_<arch>.
Change-Id: I48d1face7baf642f3ef17f957448ccb73788765f