OSDN Git Service
The Android Automerger [Thu, 14 Apr 2016 19:10:06 +0000 (12:10 -0700)]
"NRD14B"
The Android Automerger [Thu, 14 Apr 2016 07:06:20 +0000 (00:06 -0700)]
"NRD14"
The Android Automerger [Thu, 14 Apr 2016 07:02:33 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Tao Bao [Wed, 13 Apr 2016 23:59:36 +0000 (23:59 +0000)]
Merge "releasetools: Only verify the blocks to be touched." into nyc-dev
The Android Automerger [Wed, 13 Apr 2016 22:17:22 +0000 (15:17 -0700)]
"NRD13B"
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.
Bug:
28053885
(cherry picked from commit
cd1e16a7616092e5a315b0a421a0c082da144145)
Change-Id: If286eb382e59b3084a8313ae853b807e4648e5a2
Michael Wright [Wed, 13 Apr 2016 16:57:13 +0000 (16:57 +0000)]
Merge "DO NOT MERGE Remove inputflinger from the nyc build." into nyc-dev
The Android Automerger [Wed, 13 Apr 2016 07:07:38 +0000 (00:07 -0700)]
"NRD13"
The Android Automerger [Wed, 13 Apr 2016 07:02:54 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Tao Bao [Tue, 12 Apr 2016 22:53:16 +0000 (15:53 -0700)]
releasetools: Only verify the blocks to be touched.
For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.
Bug:
27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
Tianjie Xu [Tue, 12 Apr 2016 22:38:23 +0000 (22:38 +0000)]
Merge "Remove post-install verification" into nyc-dev
Andreas Gampe [Tue, 12 Apr 2016 22:19:04 +0000 (22:19 +0000)]
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" into nyc-dev
Andreas Gampe [Mon, 11 Apr 2016 22:10:09 +0000 (15:10 -0700)]
Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.
Bug:
27265238
(cherry picked from commit
907fb03273b6e432f113f3b414378e71f9f1cd06)
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
The Android Automerger [Tue, 12 Apr 2016 19:57:40 +0000 (12:57 -0700)]
"NRD12C"
Ying Wang [Tue, 12 Apr 2016 19:57:36 +0000 (12:57 -0700)]
Include classes.jar with class files in aar.
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.
Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
Trevor Johns [Tue, 12 Apr 2016 17:35:42 +0000 (10:35 -0700)]
Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev"
This reverts commit
6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to
e09b2c16e32cee89d6b5ac29fe5a905b76872179.
TreeHugger Robot [Tue, 12 Apr 2016 19:16:51 +0000 (19:16 +0000)]
Merge "Benchmark have their own folder" into nyc-dev
Tianjie Xu [Fri, 25 Mar 2016 22:01:33 +0000 (15:01 -0700)]
Remove post-install verification
post-install verification calls range_sha1() and checks if the given
partition has expected contents. It takes roughly 20 seconds on
angler with 2.8G system image. Remove it to speed up OTA update. Also
abort the update if block_image_update() fails, as we were relying on
post-install verification to capture block_image_update() failures.
Bug:
27729678
Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9
Trevor Johns [Tue, 12 Apr 2016 17:59:01 +0000 (17:59 +0000)]
Merge "Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev
Julien Desprez [Tue, 12 Apr 2016 09:22:06 +0000 (10:22 +0100)]
Benchmark have their own folder
Benchmark tests use a separate folder from native tests.
Bug:
27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
Trevor Johns [Tue, 12 Apr 2016 17:35:42 +0000 (10:35 -0700)]
Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev"
This reverts commit
6edfbfabad1ddbda00e0fcc713672f6e63acdf44, reversing
changes made to
e09b2c16e32cee89d6b5ac29fe5a905b76872179.
The Android Automerger [Tue, 12 Apr 2016 16:39:16 +0000 (09:39 -0700)]
"NRD12B"
Michael Wright [Mon, 11 Apr 2016 02:10:28 +0000 (22:10 -0400)]
DO NOT MERGE Remove inputflinger from the nyc build.
Change-Id: Iba52bcb3f7089984333b63eb43ea9d8ad4522e55
The Android Automerger [Tue, 12 Apr 2016 07:06:21 +0000 (00:06 -0700)]
"NRD12"
The Android Automerger [Tue, 12 Apr 2016 07:02:29 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Tao Bao [Tue, 12 Apr 2016 06:05:52 +0000 (23:05 -0700)]
releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.
Replace with common.ZipWrite() to always use a fixed timestamp.
Bug:
28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
The Android Automerger [Tue, 12 Apr 2016 02:15:27 +0000 (19:15 -0700)]
NRD11C
Tom Cherry [Tue, 12 Apr 2016 01:31:47 +0000 (01:31 +0000)]
Merge "Add ext libs to core_tiny, they're needed for wear PDK" into nyc-dev
Tom Cherry [Tue, 12 Apr 2016 00:06:59 +0000 (17:06 -0700)]
Add ext libs to core_tiny, they're needed for wear PDK
Bug:
27698377
Bug:
28117608
Change-Id: I12b93fe241d8d71d61d1cdb28d95e6c824e2420d
The Android Automerger [Mon, 11 Apr 2016 23:12:29 +0000 (16:12 -0700)]
"NRD11B"
The Android Automerger [Mon, 11 Apr 2016 23:00:14 +0000 (16:00 -0700)]
merge in nyc-release history after reset to nyc-dev
Trevor Johns [Mon, 11 Apr 2016 22:08:58 +0000 (22:08 +0000)]
Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev
The Android Automerger [Mon, 11 Apr 2016 21:57:13 +0000 (14:57 -0700)]
"NRD07C"
Trevor Johns [Mon, 11 Apr 2016 21:36:41 +0000 (14:36 -0700)]
Resolve merge conflicts of
a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
The Android Automerger [Mon, 11 Apr 2016 21:48:30 +0000 (14:48 -0700)]
"NRD11B"
The Android Automerger [Mon, 11 Apr 2016 21:47:16 +0000 (14:47 -0700)]
merge in nyc-release history after reset to nyc-dev
Maurice Lam [Mon, 11 Apr 2016 21:35:46 +0000 (21:35 +0000)]
Merge "Add be and bs to l10n builds" into nyc-dev
Dan Willemsen [Mon, 11 Apr 2016 19:59:10 +0000 (19:59 +0000)]
Merge "Ensure prebuilt executables are executable" into nyc-dev
The Android Automerger [Mon, 11 Apr 2016 19:01:08 +0000 (12:01 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 11 Apr 2016 18:57:09 +0000 (11:57 -0700)]
"NRD07C"
The Android Automerger [Mon, 11 Apr 2016 18:45:06 +0000 (11:45 -0700)]
"NRD11B"
The Android Automerger [Mon, 11 Apr 2016 18:43:15 +0000 (11:43 -0700)]
merge in nyc-release history after reset to nyc-dev
Dan Willemsen [Wed, 2 Mar 2016 06:04:57 +0000 (22:04 -0800)]
Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.
Bug:
28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit
08420cbc8ac7dabe1ceb6334ee83727e18a80d96)
Sebastien Hertz [Wed, 6 Apr 2016 16:18:47 +0000 (18:18 +0200)]
Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).
When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.
Bug:
28014424
(cherry picked from commit
74ec3f49d199f538deca795f22e454638b4d7915)
Change-Id: Ie4253981c0e6a62422ab84dfd67ef5eebc0b0284
The Android Automerger [Mon, 11 Apr 2016 07:03:35 +0000 (00:03 -0700)]
"NRD11"
The Android Automerger [Mon, 11 Apr 2016 07:02:13 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 10 Apr 2016 07:07:43 +0000 (00:07 -0700)]
"NRD10"
The Android Automerger [Sun, 10 Apr 2016 07:02:50 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Ian Pedowitz [Fri, 8 Apr 2016 21:05:00 +0000 (14:05 -0700)]
PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
Bug:
27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
Mohamad Ayyash [Fri, 8 Apr 2016 17:39:05 +0000 (17:39 +0000)]
Merge "Use fs_config files for mksquashfs" into nyc-dev
Mohamad Ayyash [Fri, 8 Apr 2016 05:10:51 +0000 (22:10 -0700)]
Use fs_config files for mksquashfs
BUG:
27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Svetoslav Ganov [Thu, 7 Apr 2016 23:36:37 +0000 (23:36 +0000)]
Merge "Add ext libs to AOSP - they are part of the system" into nyc-dev
The Android Automerger [Thu, 7 Apr 2016 23:25:56 +0000 (16:25 -0700)]
"NRD07B"
Svetoslav Ganov [Thu, 7 Apr 2016 22:29:55 +0000 (15:29 -0700)]
Add ext libs to AOSP - they are part of the system
bug:
27698377
Change-Id: Ic426e08e450598c53e4dbf9c734d808b19fae705
Joe Onorato [Thu, 7 Apr 2016 18:34:43 +0000 (18:34 +0000)]
Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
* changes:
Add generation of a module-info.json file
Remove unused module-info.txt generation.
The Android Automerger [Thu, 7 Apr 2016 07:07:48 +0000 (00:07 -0700)]
"NRD07"
The Android Automerger [Thu, 7 Apr 2016 07:02:30 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Joe Onorato [Wed, 6 Apr 2016 21:48:30 +0000 (14:48 -0700)]
Add generation of a module-info.json file
This outputs all of the modules that the build system knows about
for this invocation.
Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
The Android Automerger [Wed, 6 Apr 2016 22:39:10 +0000 (15:39 -0700)]
"NRD06B"
Joe Onorato [Wed, 6 Apr 2016 21:47:56 +0000 (14:47 -0700)]
Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
The Android Automerger [Wed, 6 Apr 2016 07:05:32 +0000 (00:05 -0700)]
"NRD06"
The Android Automerger [Wed, 6 Apr 2016 07:02:25 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Trevor Johns [Wed, 6 Apr 2016 03:12:06 +0000 (20:12 -0700)]
Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.
Conflicts:
tools/droiddoc/templates-sdk/assets/css/default.css
tools/droiddoc/templates-sdk/sdkpage.cs
Issue:
28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
The Android Automerger [Tue, 5 Apr 2016 23:09:26 +0000 (16:09 -0700)]
"NRD05B"
The Android Automerger [Tue, 5 Apr 2016 23:05:14 +0000 (16:05 -0700)]
merge in nyc-release history after reset to nyc-dev
Amanda Kassay [Thu, 31 Mar 2016 14:03:57 +0000 (10:03 -0400)]
Tabs js error fix, DevSite css issues fix, Search filtering
Staged: http://akassay.nyc.corp.google.com:8080/index.html#q=Activity
Change-Id: Id25525a8d8c927ea67cd13b43652d75ce53733cf
smain@google.com [Mon, 4 Apr 2016 23:47:28 +0000 (16:47 -0700)]
new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116
Sebastien Hertz [Tue, 5 Apr 2016 07:11:48 +0000 (07:11 +0000)]
Merge "Fix code coverage for apps" into nyc-dev
The Android Automerger [Tue, 5 Apr 2016 07:05:19 +0000 (00:05 -0700)]
"NRD05"
The Android Automerger [Tue, 5 Apr 2016 07:02:31 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
smain@google.com [Mon, 4 Apr 2016 23:17:01 +0000 (16:17 -0700)]
tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
The Android Automerger [Mon, 4 Apr 2016 22:52:01 +0000 (15:52 -0700)]
"NRD04B"
Mohamad Ayyash [Mon, 4 Apr 2016 19:46:47 +0000 (19:46 +0000)]
Merge "Always build squashfs host tools" into nyc-dev
Dirk Dougherty [Thu, 28 Jan 2016 16:32:47 +0000 (08:32 -0800)]
Update modal download dialogs for sdk/ndk download.
Revise the redirect behavior once download completes.
Add more appropriate title and download message when installing SDK tools only.
Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state.
Add styles for the Studio download page.
Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
Mohamad Ayyash [Mon, 4 Apr 2016 19:31:41 +0000 (12:31 -0700)]
Always build squashfs host tools
Now that mac compatibility has been fixed
BUG:
27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
The Android Automerger [Mon, 4 Apr 2016 19:15:09 +0000 (12:15 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 4 Apr 2016 19:10:10 +0000 (12:10 -0700)]
"NRC91F"
The Android Automerger [Mon, 4 Apr 2016 19:00:28 +0000 (12:00 -0700)]
"NRD04B"
The Android Automerger [Mon, 4 Apr 2016 18:58:51 +0000 (11:58 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 4 Apr 2016 07:03:44 +0000 (00:03 -0700)]
"NRD04"
The Android Automerger [Mon, 4 Apr 2016 07:02:15 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 3 Apr 2016 07:07:03 +0000 (00:07 -0700)]
"NRD03"
The Android Automerger [Sun, 3 Apr 2016 07:02:41 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 1 Apr 2016 21:30:56 +0000 (14:30 -0700)]
"NRC91E"
The Android Automerger [Fri, 1 Apr 2016 19:58:52 +0000 (12:58 -0700)]
"NRC91D"
Maurice Lam [Fri, 1 Apr 2016 18:59:30 +0000 (11:59 -0700)]
Add be and bs to l10n builds
Bug:
27409618
Change-Id: I244796a12d756521f8191abcacf1f15134079783
Julien Desprez [Fri, 1 Apr 2016 14:39:48 +0000 (15:39 +0100)]
Add vts to build in ninja
Bug:
27687012
Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
Dirk Dougherty [Thu, 31 Mar 2016 22:59:09 +0000 (15:59 -0700)]
increment version for fetched js and cs files to avoid proxy caching.
Change-Id: I427151284bf6777adb04e85b07b9b70355f8f7a2
Miao Wang [Thu, 31 Mar 2016 22:25:09 +0000 (22:25 +0000)]
Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev
Johan Redestig [Thu, 24 Mar 2016 12:57:03 +0000 (13:57 +0100)]
DO NOT MERGE ANYWHERE - Add libbase to otatools
build_verity_tree uses libbase since
b104044.
Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
The Android Automerger [Thu, 31 Mar 2016 21:08:19 +0000 (14:08 -0700)]
"NRC91C"
Miao Wang [Wed, 30 Mar 2016 20:29:42 +0000 (13:29 -0700)]
[RenderScript] Update the build rules for x86_64 support lib.
Bug:
19735423
- Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
to search for libm.so and libc.so in lib64/. Otherwise the linker
will report error.
Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
The Android Automerger [Thu, 31 Mar 2016 20:00:52 +0000 (13:00 -0700)]
"NRC91B"
Ying Wang [Thu, 31 Mar 2016 18:06:27 +0000 (18:06 +0000)]
Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev
Amanda Kassay [Thu, 17 Mar 2016 18:11:13 +0000 (14:11 -0400)]
Migrating web search api to custom search api on templates-sdk
akassay.nyc.corp.google.com:9000/#q=mobile
Change-Id: I71bdc7dbfede7bff0361ce00abef8081b852dd36
Sebastien Hertz [Thu, 31 Mar 2016 14:48:26 +0000 (16:48 +0200)]
Fix code coverage for apps
When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.
For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.
For full build, we ensure jacoco is on the classpath during the
jack compilation.
Bug:
27607712
Change-Id: I0ad37d74e63028a8144a125f052dc1c5fa10fc66
The Android Automerger [Thu, 31 Mar 2016 07:06:08 +0000 (00:06 -0700)]
"NRC91"
The Android Automerger [Thu, 31 Mar 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Sebastien Hertz [Thu, 31 Mar 2016 06:58:30 +0000 (06:58 +0000)]
Merge "Rename emma coverage files" into nyc-dev
Philip P. Moltmann [Thu, 31 Mar 2016 01:33:15 +0000 (01:33 +0000)]
Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev
OSDN Git Service
