OSDN Git Service
Andreas Gampe [Tue, 6 Sep 2016 21:02:53 +0000 (21:02 +0000)]
Merge changes from topic 'cherry_pms_installd'
* changes:
Otapreopt: Allow A/B dexopt only when bootcomplete
otapreopt: Collect and print size of artifacts
Don't use profiles with vm safe mode
Otapreopt: Try to mount vendor partition for A/B OTA
Otapreopt: Add init script for A/B artifact move
Otapreopt: Implement new A/B OTA path
Installd: Add support for dex2oat very-large-app property
Otapreopt: Send progress updates to update_engine
Otapreopt: Filter preopted system apps
Installd: Move app image A/B artifact
Installd: Fix bad merge
Installd: Change app image name computation
Installd: Refactor dexopt to scoped file descriptor
Installd: Remove string-helpers
Otapreopt: Fix after shared-library work
Andreas Gampe [Wed, 17 Aug 2016 00:43:33 +0000 (17:43 -0700)]
Otapreopt: Allow A/B dexopt only when bootcomplete
Under certain circumstances cmd may not return because it is waiting
for a service manager. Avoid this situation by restricting the otapreopt
script to only do work when the system has completed boot (which
means that a service manager must exist).
Bug:
30797145
Change-Id: Ic1445e20f1ca06fb38e7707771bde818836c3adc
(cherry picked from commit
90ba9eb2f155a4123ec4c8b08863572360d55776)
Andreas Gampe [Sat, 13 Aug 2016 02:35:57 +0000 (19:35 -0700)]
otapreopt: Collect and print size of artifacts
Collect and print the size of artifacts when moving after a reboot.
This helps in diagnosing issues after the fact.
Bug:
30832951
Change-Id: Iee410adf59dcbb74fa4b49edb27d028025cd8bf9
(cherry picked from commit
e7d555267725ca050ddd5e891267a61a55c9e16a)
Mathieu Chartier [Sat, 6 Aug 2016 00:48:12 +0000 (17:48 -0700)]
Don't use profiles with vm safe mode
vm safe mode uses interpret only compiler filter, this filter will
generate a full app image if a profile is also passed down. App
image generation without a profile currently has a bug where uses
library is not pruned correctly.
Bug:
30688277
Change-Id: I60d87d698789583b8ab797eb47d031c96caf6d9b
Test: N5X boot, package compile speed-profile comb.BBClient
(cherry picked from commit
d46d37b8d4f81e3ea60aeb5106d6d83dd3040775)
Andreas Gampe [Tue, 12 Jul 2016 16:47:17 +0000 (09:47 -0700)]
Otapreopt: Try to mount vendor partition for A/B OTA
Vendor apps are usually not preopted, so A/B dexopt should pick
them up. update_engine is not mounting the vendor partition, so
let otapreopt_chroot do the work.
Bug:
25612095
Bug:
29498238
Change-Id: I5a77bdb78a8e478ce10f6c1d0f911a8d6686becb
(cherry picked from commit
0ba073ce81fbe544592e0a3cd526b274e83fdf9f)
Andreas Gampe [Sat, 9 Jul 2016 18:44:12 +0000 (11:44 -0700)]
Otapreopt: Add init script for A/B artifact move
Move the /data/ota -> /data/dalvik-cache move from the zygote into
a minimal shell script. Add an init rc file to execute the script
once /data is mounted. Add Makefile rules to pull these files in
with the rest of the A/B OTA dexopt components.
The move is motivated by the new naming scheme that includes the
slot name. Passing the slot name to the zygote would complicate
the process, while the value is immediately available in the script
through a simple getprop call.
Bug:
25612095
Bug:
28069686
Change-Id: I63e718d488662e1b1de2ce857629cb90aa4f611d
(cherry picked from commit
99e2b263dd0df71b55e86f0aec6657eb38b334e1)
Andreas Gampe [Mon, 27 Jun 2016 21:25:30 +0000 (14:25 -0700)]
Otapreopt: Implement new A/B OTA path
Refactor otapreopt_script, otapreopt_chroot and otapreopt such
that the actual work will be done as a child of the script driven
by update_engine.
The script now uses the new OtaDexoptService command to get the
right parameters for a dexopt call in otapreopt. As we reach
otapreopt_chroot and otapreopt directly, we can add parameters
without tainting the regular installd path. Use this to add the
target slot suffix, and make naming of the A/B artifacts include
the suffix instead of the generic "b."
Otapreopt_chroot startup is slightly complicated because all file
descriptors must be closed. Otherwise, dex2oat needs selinux
permissions to inherit the descriptors from update_engine.
Bug:
25612095
Bug:
28069686
Change-Id: I9d7b86ac8ecfdf91af3800f7e96f41534c0afc0f
(cherry picked from commit
0354bd0eaf24de533e86885b811f816f1e4d15c8)
Andreas Gampe [Mon, 11 Jul 2016 22:19:31 +0000 (15:19 -0700)]
Installd: Add support for dex2oat very-large-app property
To support constrained devices, dex2oat supports a parameter that
can downgrade a compilation to verify-at-runtime. Expose this
through the dalvik.vm.dex2oat-very-large system property.
Bug:
29557002
Change-Id: Iace626a8ec18533d37f84a41c20729fe7e400386
(cherry picked from commit
e21ac2193d4ed1fd9bc4d5328625d3868409fe4d)
Andreas Gampe [Fri, 10 Jun 2016 22:08:53 +0000 (15:08 -0700)]
Otapreopt: Send progress updates to update_engine
Use the new OtaDexoptService progress API to send updates back
to update_engine.
Bug:
25612095
Bug:
29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
(cherry picked from commit
6c05a734ce443cb5effd01120c5a83b93343b6b6)
Andreas Gampe [Wed, 8 Jun 2016 22:11:37 +0000 (15:11 -0700)]
Otapreopt: Filter preopted system apps
The tool will receive requests to compile preopted system apps, as
we can't detect changes right now and need to be conservative. As
some apps cannot be stripped (signed before being preopted), they
can be re-compiled on device, producing stale files that won't be
cleaned up.
Add code to detect this situation and avoid a compile.
Bug:
25612095
Change-Id: I5f489e61b8d4e5b619cbaa01f6c59880479a46cd
(cherry picked from commit
1409090c0a92751f9fe7406a6e043cdbce2ebe4d)
Andreas Gampe [Mon, 6 Jun 2016 22:36:18 +0000 (15:36 -0700)]
Installd: Move app image A/B artifact
In addition to odex, also move art file.
Bug:
25612095
Change-Id: I69f4c2b1e7283c9a9c361f57f5233e66679c5c28
(cherry picked from commit
af8948d90605ad116c965c25e73e0fc9782112ab)
Andreas Gampe [Wed, 8 Jun 2016 06:16:46 +0000 (23:16 -0700)]
Installd: Fix bad merge
Don't cut off the leading dex location character.
Bug:
25612095
Change-Id: Iad556a0bb48c57f3c68ee75ee41f14e88d96b1a8
(cherry picked from commit
f065032f5331e1739fe32a2db9df8c91905720f9)
Andreas Gampe [Sat, 4 Jun 2016 04:13:50 +0000 (21:13 -0700)]
Installd: Change app image name computation
Refactor computation to take A/B OTAs into account.
Fix a const issue.
Bug:
25612095
Change-Id: I5cf79def532d1eeec4b35bb80014376959083a83
(cherry picked from commit
d01a02ce6980de0024333b4673cff9a77be629cf)
Andreas Gampe [Fri, 3 Jun 2016 23:09:32 +0000 (16:09 -0700)]
Installd: Refactor dexopt to scoped file descriptor
Refactor the goto-fail cleanup to a unique_fd-like wrapper that
includes a potential cleanup step. In preparation for changes for
A/B OTA.
Bug:
25612095
Change-Id: If6cca85c12e0951bc468cb4f212b2f2d288c6041
(cherry picked from commit
afa58d175cc3e9adaa4f8df9bc7a8fac5798a50a)
Andreas Gampe [Fri, 3 Jun 2016 17:22:19 +0000 (10:22 -0700)]
Installd: Remove string-helpers
Replace string-helpers with equivalent functions from android::base.
Bug:
25612095
Change-Id: I186461b94dffe3590c16455d4dee0c2cbe921bf4
(cherry picked from commit
4769ccafd6e6b94ab73afcb755fe59764c228eae)
Andreas Gampe [Fri, 3 Jun 2016 00:56:45 +0000 (17:56 -0700)]
Otapreopt: Fix after shared-library work
Commit
b63d91fd2737680351876406277b6c759f4db33c broke the installd
to otapreopt connection. Fix this. Also refactor a bit to make an
inadvertant break harder.
Bug:
25612095
Change-Id: I8e7b944ecbd5457e4ac4d6ffffdb0468618cf65f
(cherry picked from commit
aef445d1c659698612c0e5a8f3d5f2b9f8a2b778)
Chih-hung Hsieh [Fri, 2 Sep 2016 16:11:33 +0000 (16:11 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."
Chih-hung Hsieh [Fri, 2 Sep 2016 02:25:41 +0000 (02:25 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:37:47 +0000 (11:37 -0700)]
Fix google-explicit-constructor warnings in vulkan.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I13c32bd5bc53fe897df58eda331ff70ebcf0b349
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:28:23 +0000 (11:28 -0700)]
Fix google-explicit-constructor warnings in inputflinger.
* Add explicit keyword to conversion constructors.
Bug:
28341362
Test: build with WITH_TIDY=1
Change-Id: I8259317db74b177b6e62a0aa2ad21aead47f698e
Treehugger Robot [Mon, 29 Aug 2016 22:36:05 +0000 (22:36 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"
Dan Willemsen [Mon, 1 Aug 2016 08:12:35 +0000 (01:12 -0700)]
Remove FRAMEBUFFER_FORCE_FORMAT
It's no longer used, except for a debugging line.
Change-Id: I44e1c17129e71168b263e872e9aaab0f164d3832
Martijn Coenen [Thu, 25 Aug 2016 20:08:14 +0000 (20:08 +0000)]
Merge changes from topic 'utf'
* changes:
Add bound checks to utf16_to_utf8
Unicode: specify destination length in utf8_to_utf16 methods
Treehugger Robot [Thu, 25 Aug 2016 19:14:49 +0000 (19:14 +0000)]
Merge "binder: use ashmem_valid()"
Hans Boehm [Thu, 25 Aug 2016 18:39:01 +0000 (18:39 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"
Mark Salyzyn [Tue, 23 Aug 2016 23:15:04 +0000 (16:15 -0700)]
binder: use ashmem_valid()
Bug:
30310689
Change-Id: I38e2720843f1eebec39ce6c7d957ee9a1dafac59
Sergio Giro [Tue, 28 Jun 2016 17:19:33 +0000 (18:19 +0100)]
Add bound checks to utf16_to_utf8
Bug:
29250543
Change-Id: I518e7b2fe10aaa3f1c1987586a09b1110aff7e1a
(cherry picked from commit
7e93b2ddcb49b5365fbe1dab134ffb38e6f1c719)
Sergio Giro [Thu, 21 Jul 2016 13:46:35 +0000 (14:46 +0100)]
Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
Hans Boehm [Wed, 13 Jul 2016 01:05:49 +0000 (18:05 -0700)]
Fix memory ordering issues; document IMemory peculiarities
Convert to standard atomics.
Correct mHeapId memory ordering. Required acquire ordering on loads
was missing in several places.
Remove atomic updates to count, since it is only updated with lock
held. (And would be missing fences if this were not true.)
Document the peculiar use of copy-in-write vectors in a context in
which copy-on-write is unsafe.
While we're here, consistently check dup() for errors.
Bug:
28816986
Merged-in: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Change-Id: I05b9f96e3867fa2e0abe6f319be8c56b89624c41
Christopher Wiley [Fri, 19 Aug 2016 23:25:59 +0000 (23:25 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
am:
b77d368d89
Change-Id: Ibc4639f6b1a4067b4c30ca294beb9e747736d3f8
Treehugger Robot [Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
Christopher Wiley [Fri, 19 Aug 2016 18:43:54 +0000 (11:43 -0700)]
libbinder: Support reading/writing out T[] lengths
T[] types are special: the length of the out array is written
into the inbound parcel to signal the expected length to the
server.
Bug:
30836680
Change-Id: I4f2f39fd7b1a6b94a25bd7f6c3baed430fd567bc
Test: integration tests pass with this change.
Dmitriy Filchenko [Thu, 18 Aug 2016 03:17:36 +0000 (03:17 +0000)]
Merge "Remove unused include."
am:
5242fb42fb
Change-Id: Id3ccb5f3dfb9d2188b6e570eaaa6ba23438ae392
Treehugger Robot [Thu, 18 Aug 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Remove unused include."
Dmitriy Filchenko [Thu, 18 Aug 2016 01:00:39 +0000 (18:00 -0700)]
Remove unused include.
BUG:
29824203
Change-Id: Ied8ccb8c30632b41f6c6c3d848dc94d7b1e731e0
Dan Willemsen [Fri, 5 Aug 2016 21:06:41 +0000 (14:06 -0700)]
resolve merge conflicts of
0783d5f to stage-aosp-master
Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f
Dan Willemsen [Fri, 5 Aug 2016 20:44:52 +0000 (20:44 +0000)]
Merge "Start converting Android.mk to Android.bp"
Dan Willemsen [Tue, 26 Jul 2016 00:13:45 +0000 (17:13 -0700)]
Start converting Android.mk to Android.bp
See build/soong/README.md for more information.
Merged-In: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Change-Id: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Dimitry Ivanov [Mon, 1 Aug 2016 22:47:36 +0000 (22:47 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am:
1c59b4b4e8
Change-Id: Ib0b9789d7a75928f7433557936b9fac81c53b049
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 21:13:37 +0000 (14:13 -0700)]
libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.
libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.
Bug: http://b/
30562229
Test: readelf --dyn-sym surfaceflinger and check that bsd_signal is exported for lp32
and is not exported for lp64 binary version
Change-Id: If80e45502275b26c3ee4026ab12cadd77f8fbd3b
Chia-I Wu [Fri, 29 Jul 2016 02:50:30 +0000 (02:50 +0000)]
Merge "libvulkan: Fix for -Wcast-calling-convention" into stage-aosp-master
Jesse Hall [Mon, 25 Jul 2016 06:14:18 +0000 (23:14 -0700)]
resolve merge conflicts of
75b79d3 to stage-aosp-master
Change-Id: Ia7201fb25389688231cbcfb1ac24aeef7dec79d8
Sandeep Shinde [Mon, 25 Jul 2016 03:48:26 +0000 (03:48 +0000)]
Merge \"egl: Enable EGL_KHR_GL_COLORSPACE\"
am:
5271156353
Change-Id: I2c2538852782bef9026b354ad1c0aca1e0fedbeb
Jesse Hall [Mon, 25 Jul 2016 03:38:04 +0000 (03:38 +0000)]
Merge "egl: Call loseCurrent after eglReleaseThread"
Jesse Hall [Mon, 25 Jul 2016 03:36:53 +0000 (03:36 +0000)]
Merge "egl: Enable EGL_KHR_GL_COLORSPACE"
Elliott Hughes [Fri, 22 Jul 2016 17:47:33 +0000 (17:47 +0000)]
Merge \"Fix a typo in the atrace help text.\"
am:
133650e5b1
Change-Id: Idc66112bedc8f6a31bd73e479bd8905a7875d360
Treehugger Robot [Fri, 22 Jul 2016 17:35:05 +0000 (17:35 +0000)]
Merge "Fix a typo in the atrace help text."
Elliott Hughes [Fri, 22 Jul 2016 16:38:44 +0000 (09:38 -0700)]
Fix a typo in the atrace help text.
Change-Id: I1b9d04d3d17e851d08a8ae39e26483e106516b88
Elliott Hughes [Fri, 22 Jul 2016 16:00:59 +0000 (09:00 -0700)]
resolve merge conflicts of
f5b35b6 to stage-aosp-master
Change-Id: Ie1ac182893214022a68746f563765f6a271f8d1d
Treehugger Robot [Fri, 22 Jul 2016 15:49:13 +0000 (15:49 +0000)]
Merge "Clean up memory allocation in dumpTrace."
Chia-I Wu [Fri, 22 Jul 2016 02:36:33 +0000 (10:36 +0800)]
libvulkan: Fix for -Wcast-calling-convention
It should be harmless, as NoOp does not use any argument and should never
be reached.
Bug:
30290462
Change-Id: I0592c3ce10c510713525b5aa0bd38a2f9adc5898
Elliott Hughes [Fri, 22 Jul 2016 00:12:15 +0000 (17:12 -0700)]
Clean up memory allocation in dumpTrace.
Bug: http://b/
20674092
Change-Id: Id8ba2b0efc1641929790770714e48cde545fb3b0
Dan Willemsen [Thu, 21 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Merge "Dumpstate: Fix long lines." into stage-aosp-master
Roshan Pius [Thu, 21 Jul 2016 18:28:38 +0000 (18:28 +0000)]
Merge \"Add |readString8| method which returns failure\"
am:
115e6ec7e9
Change-Id: Iaf1ea3b66ed242dcd82a88ebc0556c08a5fdf85e
Roshan Pius [Thu, 21 Jul 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Add |readString8| method which returns failure"
Roshan Pius [Mon, 18 Jul 2016 19:51:02 +0000 (12:51 -0700)]
Add |readString8| method which returns failure
Add a new method to return |String8| read failures from Parcels.
BUG:
30189542
Change-Id: I65b59887dd9a15068abe95d24d390aa577bc49a6
Christopher Ferris [Wed, 20 Jul 2016 18:09:35 +0000 (18:09 +0000)]
Merge \"Change to include linux/android/binder.h.\"
am:
b34400ea94
Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Change to include linux/android/binder.h."
Christopher Wiley [Wed, 20 Jul 2016 15:28:14 +0000 (08:28 -0700)]
Fix unused variable build errors
Change-Id: Ia4f5dc95110b75eefc41b2828990cdbbcb75c033
Christopher Wiley [Wed, 20 Jul 2016 15:10:31 +0000 (15:10 +0000)]
Merge \"libbinder: Tighten compiler warnings/errors\"
am:
ead989c34d
Change-Id: I8d06de42b9ac861b3189db936656cf906ba3597f
Treehugger Robot [Wed, 20 Jul 2016 15:04:31 +0000 (15:04 +0000)]
Merge "libbinder: Tighten compiler warnings/errors"
Pirama Arumuga Nainar [Tue, 28 Jun 2016 21:45:29 +0000 (14:45 -0700)]
Disable -Wcast-calling-convention for vulkan
The following warning is triggered by the upcoming Clang update to
r271374:
frameworks/native/vulkan/libvulkan/stubhal.cpp:114:12: error: cast
between incompatible calling conventions 'cdecl' and 'aapcs-vfp'; calls
through thispointer may abort at runtime
[-Werror,-Wcast-calling-convention]
return reinterpret_cast<PFN_vkVoidFunction>(NoOp);
Change-Id: I8de75fd6a3b579a91598aebbdd23bf74b57c3593
(cherry picked from commit
b4c0eb1d203f88f0ef9ef9c360c03bcbb3e90efc)
Sandeep Shinde [Tue, 10 Feb 2015 10:34:15 +0000 (16:04 +0530)]
egl: Enable EGL_KHR_GL_COLORSPACE
Add EGL_KHR_GL_COLORSPACE extension to EGL header.
Enable EGL_KHR_GL_COLORSPACE extension handling in meta EGL layer.
Change-Id: If6d3fe26c411ddc83d8b23bf16e93862cf68c1b6
Andreas Gampe [Tue, 19 Jul 2016 01:24:05 +0000 (18:24 -0700)]
Dumpstate: Fix long lines.
Follow-up to commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7.
Change-Id: I3faa645b0da7ea27ce3a8df2dbd3b6a50bc1c2bd
(cherry picked from commit
27cd7b256eb08bf9dec7e4e8af8375711ab10225)
Andreas Gampe [Tue, 19 Jul 2016 01:01:27 +0000 (18:01 -0700)]
Dumpstate: Use unique_fd
ScopedFd has been deprecated (and removed) in favor of unique_fd.
Bug:
21192156
Change-Id: Ic46ca6d349bf0cc640b7d4008ac540d2c6d08568
(cherry picked from commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7)
Christopher Wiley [Tue, 19 Jul 2016 18:19:00 +0000 (18:19 +0000)]
Merge \"Fix broken readNullableStrongBinder<T> implementation\"
am:
6e81c9a4c6
Change-Id: I4342a65c92cbc70f716b21c730f355da3f98dbbb
Treehugger Robot [Tue, 19 Jul 2016 18:06:37 +0000 (18:06 +0000)]
Merge "Fix broken readNullableStrongBinder<T> implementation"
Christopher Wiley [Tue, 19 Jul 2016 16:40:13 +0000 (09:40 -0700)]
libbinder: Tighten compiler warnings/errors
Use all of -Wall -Wextra -Werror and fix the minor errors that result.
Change-Id: Id56e9c454dd3570f713d161577eed6aa8e8074aa
Christopher Wiley [Tue, 19 Jul 2016 16:23:25 +0000 (09:23 -0700)]
Fix broken readNullableStrongBinder<T> implementation
Added a missing return statement. Omitting this statement
caused the compiler to silently cast a pointer to a status_t,
which in general wasn't the expected value of OK.
Only return an error when the type casted return value is null and
the IBinder we got back was not null, indicating a type error, rather
than the expected null binder.
Bug:
30160959
Change-Id: Ief3c924b902a607335eff2fcd4d860cd8523593a
Test: Integration tests in aidl that exercise this method now pass.
Christopher Ferris [Mon, 18 Jul 2016 23:57:34 +0000 (16:57 -0700)]
Change to include linux/android/binder.h.
The upstream kernels have binder.h as linux/android/binder.h, so
match that.
Bug:
30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15
Evgenii Stepanov [Thu, 14 Jul 2016 21:50:29 +0000 (21:50 +0000)]
Merge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
am:
7d8f246415
Change-Id: Ic34e6263619b98739f935e0aa05bf50aa7399829
Evgenii Stepanov [Thu, 14 Jul 2016 21:39:39 +0000 (21:39 +0000)]
Merge "Workaround alloc-dealloc-mismatch error on ASan device boot."
Evgenii Stepanov [Thu, 14 Jul 2016 21:17:24 +0000 (14:17 -0700)]
Workaround alloc-dealloc-mismatch error on ASan device boot.
/proc/self/environ inaccessible in SurfaceFlinger
=> ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not
suppressed and prevents the device from booting.
This is not perfect because, by enabling it in asan build only, the first several attempts to start
surfaceflinger fail while the /data partition is being encrypted. On the other hand, this does not affect
user builds, and device eventually gets up anyway.
BUG=b/
30067360
Change-Id: Ieaa37ff7768a11450ea33fee1f7d70a41b246c6a
Lazar Trsic [Wed, 13 Jul 2016 18:39:54 +0000 (18:39 +0000)]
Merge \"[mips] Resolve issue with .align directive, when using clang IAS\"
am:
febb7ea6a0
Change-Id: I38969dbcd1251355cf3b7bbbf2e25a20930c28df
Treehugger Robot [Wed, 13 Jul 2016 18:34:54 +0000 (18:34 +0000)]
Merge "[mips] Resolve issue with .align directive, when using clang IAS"
Lazar Trsic [Wed, 13 Jul 2016 12:53:07 +0000 (14:53 +0200)]
[mips] Resolve issue with .align directive, when using clang IAS
Clang IAS does not support .align without args, concrete value is needed.
Change-Id: I03a9daca0be380daa744307b3510446f8d6c9b7e
Chih-Hung Hsieh [Thu, 7 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge \"Fix misc-macro-parentheses warnings in opengl.\"
am:
d4ffb636d8
Change-Id: I93f0fca53e380f0272ef10c4d38ea0033cef7cc4
Chih-hung Hsieh [Thu, 7 Jul 2016 21:55:37 +0000 (21:55 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Chih-Hung Hsieh [Wed, 29 Jun 2016 21:25:19 +0000 (14:25 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Add parentheses around negative literals.
Bug:
28705665
Test: build with clang-tidy
Change-Id: I342f1d04ac08bbc28ee3ff4ebbbccbfa9f754a94
Mark Salyzyn [Fri, 24 Jun 2016 23:31:24 +0000 (23:31 +0000)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
am:
ced6078b0e
Change-Id: I5972646a22b4a853d5e711d5574c6776a781a5bd
Mark Salyzyn [Fri, 24 Jun 2016 21:37:00 +0000 (21:37 +0000)]
Merge \\"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\\" am:
00e3f2995f
am:
db290501a5
Change-Id: Ib628ab8c43db208fa891d1e19f483a1f6bea21e0
Mark Salyzyn [Fri, 24 Jun 2016 21:35:07 +0000 (21:35 +0000)]
Merge \"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\"
am:
00e3f2995f
Change-Id: Ie0eed7a01655af927304b148005e9a37f9c11883
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
(cherry pick from commit
7d0a762ecaf9f4d005f0f6db913034c2e084d362)
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Mark Salyzyn [Fri, 24 Jun 2016 21:26:16 +0000 (21:26 +0000)]
Merge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Greg Kaiser [Thu, 23 Jun 2016 03:31:57 +0000 (03:31 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am:
c0ca0ceaa5
Change-Id: Ifa6208fea63d830d07447d5232b39f9e3ccf870b
Greg Kaiser [Thu, 23 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Sensor: Make getId() more varied" into nyc-dev
Greg Kaiser [Tue, 21 Jun 2016 23:11:14 +0000 (16:11 -0700)]
Sensor: Make getId() more varied
Apps from different developers will now receive a different
ID for the same dynamic sensor. Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.
Bug:
28775590,
29547335
Change-Id: I368655b0e4bdc16736a7fd163ea3f7dad2886b3b
Felipe Leme [Wed, 22 Jun 2016 20:29:24 +0000 (20:29 +0000)]
Merge \"Run iptables as root.\" into nyc-dev
am:
ab69cc1f11
Change-Id: I1c45a731c685ddbde7630c588fb6e53a08489a75
TreeHugger Robot [Wed, 22 Jun 2016 20:24:53 +0000 (20:24 +0000)]
Merge "Run iptables as root." into nyc-dev
Greg Kaiser [Mon, 20 Jun 2016 17:21:41 +0000 (17:21 +0000)]
Merge \"SensorList: Don\'t output UUIDs\" into nyc-dev
am:
a0c08e2f8f
Change-Id: Ia791bb67a2351f68da06e0ddc35c224677e4cead
Felipe Leme [Sat, 18 Jun 2016 00:37:13 +0000 (17:37 -0700)]
Run iptables as root.
iptables requires root access and su is not available on user builds,
hence it must be ran before dropping uid to shell user.
BUG:
29455997
Change-Id: I10c6337b411875b061ae9556b6e9c44f83301ae1
Greg Kaiser [Mon, 20 Jun 2016 16:24:51 +0000 (16:24 +0000)]
Merge "SensorList: Don't output UUIDs" into nyc-dev
Eino-Ville Talvala [Sat, 18 Jun 2016 02:18:21 +0000 (02:18 +0000)]
Merge \"BufferQueueProducer: Signal consumer when a buffer is detached\" into nyc-dev
am:
51ed38bb13
Change-Id: I9adb021022e1ed4b1a5b74eaa59cc88c5de475a6
Eino-Ville Talvala [Sat, 18 Jun 2016 02:10:11 +0000 (02:10 +0000)]
Merge "BufferQueueProducer: Signal consumer when a buffer is detached" into nyc-dev
Greg Kaiser [Fri, 17 Jun 2016 22:27:12 +0000 (15:27 -0700)]
SensorList: Don't output UUIDs
We don't want the UUIDs of dynamic sensors to be in the logs.
Bug:
28775590
Change-Id: I85ca83e0ad1a0a8ed6618999bd22d86d7ef972f9
Jesse Hall [Fri, 17 Jun 2016 21:05:17 +0000 (21:05 +0000)]
vulkan: Updated IHV documentation
am:
c2f184d9d8
Change-Id: I61d568218cedd32e7deb514fd092d7d424f26218
Jesse Hall [Fri, 17 Jun 2016 20:54:53 +0000 (13:54 -0700)]
vulkan: Updated IHV documentation
Also deleted DevelopersGuide.pdf, which was very out of date and has
been superceded by public documentation on developer.android.com.
Change-Id: I7e47177191a773eea6db3ee2af0a287877cb8532
David Brazdil [Thu, 16 Jun 2016 13:24:01 +0000 (13:24 +0000)]
Merge \"Revert \"Attach profiles to bug reports\"\" into nyc-dev
am:
ea1aa91a25
Change-Id: I736c406da5b866b712c02315a787019ad307c109