Commit graph

28228 commits

Author SHA1 Message Date
Zach Jang
05a8c77e42 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
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5 Update security patch string to 2016-06-01
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
  Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
Bo Hu
94f576d18c Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev 2016-04-20 18:46:38 +00:00
Trevor Johns
0f0b53623e Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""" into nyc-dev 2016-04-20 18:35:57 +00:00
TreeHugger Robot
816dd48126 Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev 2016-04-20 01:54:54 +00:00
Colin Cross
febe2bcc21 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
2016-04-19 17:22:29 -07:00
bohu
bf863dbffc 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
2016-04-19 15:04:58 -07:00
Alex Light
6da74d8f1f Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
2016-04-19 14:31:55 -07:00
Ying Wang
8f8099c96a 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 c160c3f21a)

Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
2016-04-19 14:26:58 -07:00
Christopher Tate
65e3b75ddc Wallpaper backup/restore is now in its own package
Bug 25453848
Bug 25727875

Change-Id: I774afad99d23f4f7ffb1675909a5a17732af3fb8
2016-04-19 13:08:21 -07:00
Zach Jang
0a3b3d40c1 Update security patch string to 2016-06-01
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Trevor Johns
4ff8891dd2 Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""
This reverts commit bf234fdfba.
2016-04-19 01:15:39 -07:00
Nick Kralevich
841f6d870d 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
2016-04-18 13:28:04 -07:00
Amanda Kassay
9ba538ee05 Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html
am: 01febb9

* commit '01febb96753b08b019fb3cf53b37e4e309fbb293':
  Fix for double header and footer on ndk download pages: b/27950742 https://android-dot-devsite.googleplex.com/ndk/downloads/index.html

Change-Id: If7159b036f78455304b82dc9cb48d3bcd63948da
2016-04-18 20:20:18 +00:00
Amanda Kassay
01febb9675 Fix for double header and footer on ndk download pages: b/27950742
https://android-dot-devsite.googleplex.com/ndk/downloads/index.html

Fix for html code in page title and h1 tag: b/28237039
https://android-dot-devsite.googleplex.com/guide/topics/manifest/manifest-element.html

Change-Id: Idc9ba0a1ba33d1b89b7dbfd3d620d0e587c57459
2016-04-18 18:19:48 +00:00
smain@google.com
70136620b6 Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there\'s only one level of "tabs"" into mnc-mr-docs
am: 848295a

* commit '848295aea9bfd679c1d3aa157130c1480ee2025d':
  Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"

Change-Id: Ibed5aa568eb86b62377fefd47c7077fc4080e3eb
2016-04-15 21:38:12 +00:00
Scott Main
848295aea9 Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"" into mnc-mr-docs 2016-04-15 21:29:04 +00:00
Tao Bao
05ce0a94a5 Merge "Skip verifying the partition with no changed blocks." into nyc-dev 2016-04-15 03:22:23 +00:00
TreeHugger Robot
b55f571927 Merge "Revert "Set WifiHAL to only log debug by default."" into nyc-dev 2016-04-15 00:33:43 +00:00
Sebastien Hertz
ad84f802fc Merge "Allow to force min sdk given to Jack" into nyc-dev 2016-04-14 23:17:18 +00:00
Tao Bao
f9efe284a4 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 d522bdc9ed

Bug: 27813356
Bug: 28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
2016-04-14 16:12:06 -07:00
mukesh agrawal
9d14641a19 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 f83213a5b5.

BUG=28178513
TEST=build, check log volume after >12 hours
2016-04-14 16:06:13 -07:00
Tao Bao
8fe9274ab9 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev 2016-04-14 22:11:18 +00:00
Yohann Roussel
d98c42071a 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 109141ccc9)

Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
2016-04-14 23:25:14 +02:00
Tao Bao
cffaf73f84 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
2016-04-14 13:33:35 -07:00
Ying Wang
2e2c137913 Reject Google's build of JDK.
Bug: 28097637

(cherry picked from commit 22b23b9b00)

Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
2016-04-14 12:30:25 -07:00
Amanda Kassay
b32745ef8d Added html escape for search queries to fix XSS issue b/28135307
am: 2bb3328

* commit '2bb332896563f6850698c93041a399a86db8f50b':
  Added html escape for search queries to fix XSS issue b/28135307

Change-Id: If6ff5f1750c823cd9d8e1b92a667360e0f341629
2016-04-14 18:35:28 +00:00
Amanda Kassay
2bb3328965 Added html escape for search queries to fix XSS issue
b/28135307

Change-Id: Ifd1a0eadbdb726558446af4860986d1af55b77ae
2016-04-14 16:48:37 +00:00
smain@google.com
80beb0a145 Remove nav toggle and up-nav for desktop size screens
and remove breadcrumbs for the Studio docs, because these are
not needed when there's only one level of "tabs"

Also deleted a strangely redundant screen-size declaration for the header-tabs visiblity.

For now this applies only to Studio docs (body.studio selector).
Later, we should update the Android templates to use a new class
in the body such as "no-global-nav" to trigger these styles

Change-Id: If398814871980b56e3e0484244dee364198d687c
2016-04-13 19:08:44 -07:00
Tao Bao
21528c5e05 Merge "releasetools: Only verify the blocks to be touched." into nyc-dev 2016-04-13 23:59:36 +00:00
Tianjie Xu
8e1fb06f38 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 cd1e16a761)

Change-Id: If286eb382e59b3084a8313ae853b807e4648e5a2
2016-04-13 15:02:20 -07:00
Michael Wright
3ae0f24dc2 Merge "DO NOT MERGE Remove inputflinger from the nyc build." into nyc-dev 2016-04-13 16:57:13 +00:00
Tao Bao
d522bdc9ed 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
2016-04-12 16:41:01 -07:00
Tianjie Xu
3ebddd40e0 Merge "Remove post-install verification" into nyc-dev 2016-04-12 22:38:24 +00:00
Andreas Gampe
4b941608e9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" into nyc-dev 2016-04-12 22:19:04 +00:00
Andreas Gampe
7928bc8554 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 907fb03273)

Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-12 14:24:50 -07:00
Ying Wang
8419b7f35e 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
2016-04-12 12:57:36 -07:00
TreeHugger Robot
bc3720c695 Merge "Benchmark have their own folder" into nyc-dev 2016-04-12 19:16:52 +00:00
Tianjie Xu
b2deb22033 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
2016-04-12 11:40:03 -07:00
Trevor Johns
18c202a7d3 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev 2016-04-12 17:59:02 +00:00
Julien Desprez
188a1dd18f Benchmark have their own folder
Benchmark tests use a separate folder from native tests.

Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
2016-04-12 18:57:36 +01:00
Trevor Johns
bf234fdfba Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
2016-04-12 10:35:42 -07:00
Michael Wright
22adbae358 DO NOT MERGE Remove inputflinger from the nyc build.
Change-Id: Iba52bcb3f7089984333b63eb43ea9d8ad4522e55
2016-04-12 09:26:02 -04:00
Tao Bao
7ee3a9678e 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
2016-04-11 23:10:00 -07:00
Tom Cherry
ca0df0c249 Merge "Add ext libs to core_tiny, they're needed for wear PDK" into nyc-dev 2016-04-12 01:31:47 +00:00
Tom Cherry
1d242f18a6 Add ext libs to core_tiny, they're needed for wear PDK
Bug: 27698377
Bug: 28117608
Change-Id: I12b93fe241d8d71d61d1cdb28d95e6c824e2420d
2016-04-11 17:06:59 -07:00
Trevor Johns
6edfbfabad Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev 2016-04-11 22:08:59 +00:00
Trevor Johns
f719c29ea9 Resolve merge conflicts of a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
2016-04-11 14:55:35 -07:00
Maurice Lam
e09b2c16e3 Merge "Add be and bs to l10n builds" into nyc-dev 2016-04-11 21:35:46 +00:00
Dan Willemsen
758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +00:00