57d4c59559
Merge "init: expand generated attributes on sepolicy compile" into oc-dev
2017-04-13 18:11:08 +00:00
d278253378
init: expand generated attributes on sepolicy compile
...
Expand auto generated attributes in selinux policy when doing
on-device compile of platform + vendor selinux policy.
Bug: 3650825
Test: Build and boot Marlin
Change-Id: Icc1c3af0b504236ae13fd8a5155c2109befd7688
2017-04-13 17:32:51 +00:00
95f9a9678d
Merge "Moved include/backtrace to libbacktrace/include" into oc-dev
2017-04-13 16:53:13 +00:00
a130b80069
Moved include/backtrace to libbacktrace/include
...
Export libbacktrace_headers
cherry-pick from commit 8f2c28d572
2017-04-13 09:26:20 -07:00
bed3cbd8ac
Merge "libutils: mark as vendor_available" into oc-dev
2017-04-13 04:55:20 +00:00
f8952a196c
Merge "restorecon hwservice_contexts." into oc-dev
2017-04-13 03:34:48 +00:00
6887273a28
restorecon hwservice_contexts.
...
Test: marlin boots, angler boots
Bug: 34454312
Change-Id: I5da8b0b10a7a4c0e6e0c9aea39004852889e8d97
2017-04-12 18:02:33 -07:00
a02b1f5bed
Merge "disable module loading after BOOT_COMPLETED broadcast" into oc-dev
2017-04-12 22:58:18 +00:00
a22648179d
Merge "Moved all files from include/system to libsystem/include/system" into oc-dev
2017-04-12 20:56:21 +00:00
692c3e4d38
init: use platform sepolicy version indicated by /vendor.
...
It's possible, in the event of a platform update, for the platform
SELinux policy to change from the policy on which the vendor SELinux
policy was originally based. In this case, a different mapping file
to bridge the differences between the new policy and the old needs to
be selected.
Make init choose which mapping policy file to use based on the version
reported in /vendor/etc/selinux/plat_sepolicy_vers.txt.
Bug: 36783775
Test: Force compilation of sepolicy on-device with mapping file changed
to new location and name, using the value reported on /vendor.
Change-Id: I63c883ccb79dd31c92dabe44a55c4ab50a3735e6
2017-04-12 10:45:08 -07:00
91527edec8
libutils: mark as vendor_available
...
By setting vendor_available, the following may become true:
* a prebuilt library from this release may be used at runtime by
in a later releasse (by vendor code compiled against this release).
so this library shouldn't depend on runtime state that may change
in the future.
* this library may be loaded twice into a single process (potentially
an old version and a newer version). The symbols will be isolated
using linker namespaces, but this may break assumptions about 1
library in 1 process (your singletons will run twice).
Background:
This means that these modules may be built and installed twice --
once for the system partition and once for the vendor partition. The
system version will build just like today, and will be used by the
framework components on /system. The vendor version will build
against a reduced set of exports and libraries -- similar to, but
separate from, the NDK. This means that all your dependencies must
also mark vendor_available.
At runtime, /system binaries will load libraries from /system/lib*,
while /vendor binaries will load libraries from /vendor/lib*. There
are some exceptions in both directions -- bionic(libc,etc) and liblog
are always loaded from /system. And SP-HALs (OpenGL, etc) may load
/vendor code into /system processes, but the dependencies of those
libraries will load from /vendor until it reaches a library that's
always on /system. In the SP-HAL case, if both framework and vendor
libraries depend on a library of the same name, both versions will be
loaded, but they will be isolated from each other.
It's possible to compile differently -- reducing your source files,
exporting different include directories, etc. For details see:
https://android-review.googlesource.com/368372
None of this is enabled unless the device opts into the system/vendor
split with BOARD_VNDK_VERSION := current.
Bug: 36426473
Bug: 36079834
Test: m -j libutils
Test: attempt to compile with BOARD_VNDK_VERSION := current
Merged-In: I6c1279a74ef071851401e38bbdd377f13827694c
Change-Id: I6c1279a74ef071851401e38bbdd377f13827694c
2017-04-12 16:00:02 +00:00
585e6a89d7
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78 am: 587efe8ee9
...
am: 745f034705
2017-04-11 20:20:38 +00:00
06e1a3d8b2
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e am: 5fa554a46a
...
am: 223de992a4
2017-04-11 20:20:25 +00:00
745f034705
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5 am: 02e7225f78
...
am: 587efe8ee9
2017-04-11 20:20:01 +00:00
223de992a4
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038 am: 3c3eed744e
...
am: 5fa554a46a
2017-04-11 20:15:01 +00:00
587efe8ee9
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044 am: 497461adc5
...
am: 02e7225f78
2017-04-11 20:15:01 +00:00
e170e3876b
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070 am: d4b4f0a1e1
...
am: 2aea56db64
2017-04-11 20:11:24 +00:00
02e7225f78
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours am: c800d82044
...
am: 497461adc5
2017-04-11 20:11:00 +00:00
5fa554a46a
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb am: 2d37855038
...
am: 3c3eed744e
2017-04-11 20:10:30 +00:00
2aea56db64
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc am: 0b1ad23070
...
am: d4b4f0a1e1
2017-04-11 20:05:01 +00:00
3c3eed744e
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours am: 01574980eb
...
am: 2d37855038
2017-04-11 20:05:01 +00:00
497461adc5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5 am: 1bc2862ac5 -s ours
...
am: c800d82044
2017-04-11 20:05:01 +00:00
d4b4f0a1e1
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56 am: afddaba0cc
...
am: 0b1ad23070
2017-04-11 19:59:59 +00:00
2d37855038
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490 am: cce7621064 -s ours
...
am: 01574980eb
2017-04-11 19:59:59 +00:00
c800d82044
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706 am: ebcba388f5
...
am: 1bc2862ac5
2017-04-11 19:59:58 +00:00
0b1ad23070
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc am: bc8c8e4b56
...
am: afddaba0cc
2017-04-11 19:55:28 +00:00
01574980eb
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece am: df5ee70490
...
am: cce7621064
2017-04-11 19:55:28 +00:00
1bc2862ac5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc am: 89054eb706
...
am: ebcba388f5
2017-04-11 19:55:28 +00:00
afddaba0cc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29 am: ed33065bfc
...
am: bc8c8e4b56
2017-04-11 19:51:00 +00:00
cce7621064
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374 am: 18ccbc2ece
...
am: df5ee70490
2017-04-11 19:50:58 +00:00
ebcba388f5
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours am: de0f0b8ecc
...
am: 89054eb706
2017-04-11 19:50:57 +00:00
bc8c8e4b56
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434 am: 25c0d68d29
...
am: ed33065bfc
2017-04-11 19:45:58 +00:00
df5ee70490
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours am: f7903d4374
...
am: 18ccbc2ece
2017-04-11 19:45:58 +00:00
89054eb706
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426 am: 556afe82f2 -s ours
...
am: de0f0b8ecc
2017-04-11 19:45:57 +00:00
18ccbc2ece
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5 am: 368f3d273d -s ours
...
am: f7903d4374
2017-04-11 19:39:58 +00:00
ed33065bfc
Fix out of bound read in libziparchive am: d9fd1863f4 am: 6908996434
...
am: 25c0d68d29
2017-04-11 19:39:57 +00:00
de0f0b8ecc
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours am: 2b4a6de426
...
am: 556afe82f2
2017-04-11 19:39:56 +00:00
25c0d68d29
Fix out of bound read in libziparchive am: d9fd1863f4
...
am: 6908996434
2017-04-11 19:34:28 +00:00
556afe82f2
Do Not Merge: Fix out of bound read in libziparchive am: 6fdfd58fe1 -s ours
...
am: 2b4a6de426
2017-04-11 19:34:28 +00:00
f7903d4374
Do Not Merge: Fix out of bound read in libziparchive am: a8d932f2a5
...
am: 368f3d273d
2017-04-11 19:34:26 +00:00
6908996434
Fix out of bound read in libziparchive
...
am: d9fd1863f4
2017-04-11 19:29:57 +00:00
368f3d273d
Do Not Merge: Fix out of bound read in libziparchive
...
am: a8d932f2a5
2017-04-11 19:29:57 +00:00
2b4a6de426
Do Not Merge: Fix out of bound read in libziparchive
...
am: 6fdfd58fe1
2017-04-11 19:29:56 +00:00
91e3f638b7
Merge "libziparchive: verify that gpb flags match" into oc-dev
2017-04-11 18:30:51 +00:00
88bff3613e
Moved all files from include/system to libsystem/include/system
...
Bug: 33241851
Test: No changes for modules not using VNDK. For compiling with VNDK,
add libsystem_headers as dependency for using these headers
Merged-In: I2acce0ab771e10ac83461c2f931e2c19e922089e
Change-Id: I2acce0ab771e10ac83461c2f931e2c19e922089e
2017-04-11 16:13:42 +00:00
ce4c78224d
Merge changes from topic 'llndk_rename' into oc-dev
...
* changes:
Remove .(ll)ndk suffix from (ll)ndk_library
Remove .(ll)ndk suffix from (ll)ndk_library
2017-04-11 07:22:26 +00:00
4d4348c771
Merge "poll umount completion from /proc/mounts" into oc-dev
2017-04-11 01:46:26 +00:00
d4c8d87a9b
Merge "ZipWriter: Keep LFH and CFH in sync" into oc-dev
2017-04-11 01:28:45 +00:00
6ed19d1675
disable module loading after BOOT_COMPLETED broadcast
...
This CL disables module loading by writing 1 to
/proc/sys/kernel/modules_disabled when the property sys.boot_completed
is set to 1 by ActivityManagerService (at the broadcast of
PHASE_BOOT_COMPLETED).
Bug: 36515654
Test: tested on sailfish and verified that module loading is disabled in
userdebug and enabled in eng mode
Change-Id: Id38d34a6395966ab21e440614337c0cfca791ad0
2017-04-11 10:22:47 +09:00
64d1849077
Merge "libgrallocusage: use gralloc1.h usage flags" into oc-dev
2017-04-11 01:08:38 +00:00
Jeffrey Vander Stoep