OSDN Git Service
Baligh Uddin [Mon, 25 Apr 2016 23:47:24 +0000 (23:47 +0000)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools am:
69cf5df -s ours
am:
b664e90 -s ours
* commit '
b664e9074facc99748bcf91ec913c302cf930fbf':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I7063cddb2b6c5ec6691b386daf1a26b48723f764
Igor Murashkin [Mon, 25 Apr 2016 23:39:15 +0000 (23:39 +0000)]
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
Keun Soo Yim [Mon, 25 Apr 2016 21:57:13 +0000 (21:57 +0000)]
Merge "build rule change for VTS (vendor test suite)'s metadata files" into nyc-dev
TreeHugger Robot [Mon, 25 Apr 2016 21:53:29 +0000 (21:53 +0000)]
Merge "Add fake libart" into nyc-dev
Keun Soo Yim [Fri, 19 Feb 2016 19:06:58 +0000 (11:06 -0800)]
build rule change for VTS (vendor test suite)'s metadata files
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
Tao Bao [Mon, 25 Apr 2016 17:03:38 +0000 (10:03 -0700)]
target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.
Bug:
28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
Baligh Uddin [Sun, 24 Apr 2016 19:46:27 +0000 (19:46 +0000)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
am:
69cf5df -s ours
* commit '
69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944
Baligh Uddin [Sun, 24 Apr 2016 19:40:03 +0000 (12:40 -0700)]
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Bug:
23967152
Zach Jang [Wed, 20 Apr 2016 22:11:57 +0000 (22:11 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b am:
63398dd am:
d402579
am:
3f578d2
* commit '
3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
Update security patch string to 2016-06-01
Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]
Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
Zach Jang [Wed, 20 Apr 2016 21:55:11 +0000 (21:55 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b am:
63398dd
am:
d402579
* commit '
d402579bc0beb02007172259c0c686b930cc77d4':
Update security patch string to 2016-06-01
Change-Id: I4b9b46ae2fec761ec84cec722d652658bf5489e0
Zach Jang [Wed, 20 Apr 2016 21:47:54 +0000 (21:47 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77 am:
d4b8d2b
am:
63398dd
* commit '
63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01
Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
Zach Jang [Wed, 20 Apr 2016 21:42:16 +0000 (21:42 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757 am:
05a8c77
am:
d4b8d2b
* commit '
d4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01
Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
Zach Jang [Wed, 20 Apr 2016 21:35:11 +0000 (21:35 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4 am:
0ca3757
am:
05a8c77
* commit '
05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01
Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
Zach Jang [Wed, 20 Apr 2016 19:50:19 +0000 (19:50 +0000)]
Update security patch string to 2016-06-01 am:
0a3b3d4
am:
0ca3757
* commit '
0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
Zach Jang [Wed, 20 Apr 2016 18:49:54 +0000 (18:49 +0000)]
Update security patch string to 2016-06-01
am:
0a3b3d4
* commit '
0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
Bo Hu [Wed, 20 Apr 2016 18:46:37 +0000 (18:46 +0000)]
Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
Trevor Johns [Wed, 20 Apr 2016 18:35:54 +0000 (18:35 +0000)]
Merge "Revert "Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev""" into nyc-dev
TreeHugger Robot [Wed, 20 Apr 2016 01:54:54 +0000 (01:54 +0000)]
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
Colin Cross [Wed, 20 Apr 2016 00:22:29 +0000 (17:22 -0700)]
Make jack_check_timestamp depend on setup-jack-server
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/
2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
bohu [Tue, 19 Apr 2016 22:04:58 +0000 (15:04 -0700)]
Fix emulator specific SELinux denials related to qemu.gles
init: avc: denied { set } for property=qemu.gles pid=108 uid=1003 gid=1003 scontext=u:r:bootanim:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
init: avc: denied { set } for property=qemu.gles pid=75 uid=0 gid=0 scontext=u:r:zygote:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
bug:
28221393
Change-Id: Icb0ee7fbf9a7b985f66fac087a48d9b5789e2b67
Alex Light [Fri, 15 Apr 2016 17:19:02 +0000 (10:19 -0700)]
Add fake libart
Bug:
27775991
Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
Ying Wang [Tue, 19 Apr 2016 19:13:54 +0000 (12:13 -0700)]
Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.
Bug:
27775991
(cherry picked from commit
c160c3f21a878bebcc94e0a282a6b2b899b356bb)
Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
Christopher Tate [Wed, 13 Apr 2016 01:24:53 +0000 (18:24 -0700)]
Wallpaper backup/restore is now in its own package
Bug
25453848
Bug
25727875
Change-Id: I774afad99d23f4f7ffb1675909a5a17732af3fb8
Zach Jang [Tue, 19 Apr 2016 17:56:31 +0000 (10:56 -0700)]
Update security patch string to 2016-06-01
b/
28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
Trevor Johns [Tue, 19 Apr 2016 08:15:39 +0000 (01:15 -0700)]
Revert "Revert "Merge "Resolve merge conflicts of
a5f0068 to nyc-dev" into nyc-dev""
This reverts commit
bf234fdfba1116cc29e8cc8443d08804843edf94.
Nick Kralevich [Mon, 18 Apr 2016 20:28:04 +0000 (13:28 -0700)]
Address emulator specific SELinux denials
Fix the following denials:
avc: denied { search } for pid=222 comm="system_server"
name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
tclass=file permissive=1
avc: denied { read } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { getattr } for pid=222 comm="system_server"
path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
ino=1430 scontext=u:r:system_server:s0
tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1
avc: denied { search } for pid=424 comm="putmethod.latin"
name="qemu_trace" dev="sysfs" ino=45
scontext=u:r:untrusted_app:s0:c512,c768
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
Bug:
28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
Tao Bao [Fri, 15 Apr 2016 03:22:23 +0000 (03:22 +0000)]
Merge "Skip verifying the partition with no changed blocks." into nyc-dev
TreeHugger Robot [Fri, 15 Apr 2016 00:33:43 +0000 (00:33 +0000)]
Merge "Revert "Set WifiHAL to only log debug by default."" into nyc-dev
Sebastien Hertz [Thu, 14 Apr 2016 23:17:18 +0000 (23:17 +0000)]
Merge "Allow to force min sdk given to Jack" into nyc-dev
Tao Bao [Thu, 14 Apr 2016 22:58:05 +0000 (15:58 -0700)]
Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.
[1]: commit
d522bdc9edbf64d15a59c6924853b2e2c8c39e90
Bug:
27813356
Bug:
28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
mukesh agrawal [Thu, 14 Apr 2016 23:06:13 +0000 (16:06 -0700)]
Revert "Set WifiHAL to only log debug by default."
Recent changes have brought the log volumes for
the QCA WifiHAL down to reasonable levels. As
such, we no longer need to use a custom default
log level for WifiHAL.
This reverts commit
f83213a5b5cd69dc816daa27cff6d03c4d75b5a4.
BUG=
28178513
TEST=build, check log volume after >12 hours
Tao Bao [Thu, 14 Apr 2016 22:11:17 +0000 (22:11 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev
Yohann Roussel [Thu, 14 Apr 2016 19:51:46 +0000 (21:51 +0200)]
Allow to force min sdk given to Jack
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.
Bug:
28188420
(cherry picked from commit
109141ccc97d27cfc72affe3c45f3e6c2fb89702)
Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
Tao Bao [Thu, 14 Apr 2016 19:11:36 +0000 (12:11 -0700)]
Makefile: Pack squashfs and f2fs tools into otatools.zip.
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).
squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh
Bug:
28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
Ying Wang [Wed, 13 Apr 2016 21:33:00 +0000 (14:33 -0700)]
Reject Google's build of JDK.
Bug:
28097637
(cherry picked from commit
22b23b9b00a3474c95cc314c33aa66a747be13e4)
Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
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
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
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
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
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.
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
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
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
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
Trevor Johns [Mon, 11 Apr 2016 21:36:41 +0000 (14:36 -0700)]
Resolve merge conflicts of
a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
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
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
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>
Igor Murashkin [Thu, 7 Apr 2016 23:55:08 +0000 (16:55 -0700)]
old-cts: Add testng and libcoreoj test support
Bug:
27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
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
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.
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
Joe Onorato [Wed, 6 Apr 2016 21:47:56 +0000 (14:47 -0700)]
Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
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
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
smain@google.com [Mon, 4 Apr 2016 23:17:01 +0000 (16:17 -0700)]
tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
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>
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
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
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
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
Andreas Gampe [Wed, 30 Mar 2016 23:05:59 +0000 (23:05 +0000)]
Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev
Colin Cross [Wed, 30 Mar 2016 22:18:33 +0000 (22:18 +0000)]
Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
Handle symlinked OUT_DIRs (again)
Handle out being a symlink
smain@google.com [Wed, 16 Mar 2016 18:30:53 +0000 (11:30 -0700)]
new search results layout.
no more custom suggestions; just API matches and organic results.
Change-Id: I6324aa6fb289f5d93aa701aecbd7fad64711d35f
smain@google.com [Sat, 27 Feb 2016 00:30:50 +0000 (16:30 -0800)]
remove dev guide search suggestions, move organic search results up.
tweak the search suggest for reference pages
Change-Id: I14e48fdac3f103dd998591886b91e5f6040b0f7a
Andreas Gampe [Wed, 30 Mar 2016 19:18:34 +0000 (12:18 -0700)]
Build: Switch eng build boot dexopt to verify-at-runtime
To have faster turnaround.
Bug:
26794212
Change-Id: I1d7877ec8c9cfff62bf14cbd23a790ee7a0b2734
Dan Willemsen [Tue, 22 Mar 2016 21:44:17 +0000 (14:44 -0700)]
Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.
This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.
Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:
1) Soong generates out.angler/soong/Android.mk
2) Kati's find generator produces in-memory tree of the filesystem
3) $(shell ) creates out.angler/Android.mk
4) The emulated findleaves Android.mk search finds
out.angler/soong/Android.mk since the in-memory tree is never updated.
This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.
Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit
cc60f013576627bee37cd4d6c58bf740d35d0434)
[ccross: resolved conflicts in nyc-dev]
Dan Willemsen [Sat, 12 Mar 2016 00:11:25 +0000 (16:11 -0800)]
Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.
Bug:
27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
(cherry picked from commit
d53c0c7b45c3b18949fc62b784a8e8a877323493)
[ccross: resolved conflicts in nyc-dev]
Neil Fuller [Fri, 19 Feb 2016 10:37:22 +0000 (10:37 +0000)]
Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.
Bug:
27475234
Bug:
26753820
Bug:
26604040
Change-Id: Ifc79eebabfc6b64c0daf6b9ca236d1967a45a735
Sebastien Hertz [Fri, 25 Mar 2016 16:11:38 +0000 (17:11 +0100)]
Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.
This CL renames coverage files generated by emma so they no longer
break those created by Jack.
Keep coverage.em file name for host rules where Jack is not called.
Bug:
27822188
(cherry picked from commit
491c9ce48add521e7c0cdbe1c1fa7ea392b775a5
&& commit
8f0e52c3a66b4c493f0d133e00591ae7d376eb49)
Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
Ying Wang [Tue, 29 Mar 2016 21:31:24 +0000 (21:31 +0000)]
Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev
Allen Hair [Tue, 29 Mar 2016 21:18:24 +0000 (21:18 +0000)]
Merge "Only add jacocoagent if the package contains some java code." into nyc-dev
Amanda Kassay [Tue, 29 Mar 2016 20:11:01 +0000 (16:11 -0400)]
Adding book metadata to doc head, fix tabs for content build,
fix for reference page double footer.
Change-Id: I8e721c60e21203b599779e31f48336d450a53fa3
Ying Wang [Tue, 29 Mar 2016 19:41:42 +0000 (12:41 -0700)]
Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit
e758f9319dcb6cc9693af03cc03d385167a35a8d we switched from
TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in
add-assets-to-package but forgot to set the variable when we are running
the old aapt.
Bug:
27874886
Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea