Jeff Vander Stoep
6fb86da61b
Remove restorecon of file_contexts.bin
...
file_contexts.bin is dead. Long live split file_contexts.
Test: build and flash angler.
Change-Id: I962743ce3e98aefee14d972e04bf4e68bec633a5
2017-06-14 11:15:00 -07:00
Nicolas Norvez
c5ba667adf
Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c
am: 516ee2445d
am: 6ff249f483
...
am: c616a8ad84
Change-Id: I2966b6d236e70e62c48c13c8e48807e4118be992
2017-06-12 21:56:35 +00:00
Nicolas Norvez
c616a8ad84
Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c
am: 516ee2445d
...
am: 6ff249f483
Change-Id: I7a5886b9a9c325036007ad9251b0952fdbd7a206
2017-06-12 21:53:42 +00:00
Nicolas Norvez
6ff249f483
Merge "adbd: optionally use qemud pipe without ro.kernel.qemu" am: b3c363f32c
...
am: 516ee2445d
Change-Id: Iaf3be508465ea6ab59fc6a7f4fb0b2878d50b279
2017-06-12 21:48:35 +00:00
Nicolas Norvez
516ee2445d
Merge "adbd: optionally use qemud pipe without ro.kernel.qemu"
...
am: b3c363f32c
Change-Id: Id98add505c45a7e49141d13d535fb3849287ba0e
2017-06-12 21:46:03 +00:00
Treehugger Robot
b3c363f32c
Merge "adbd: optionally use qemud pipe without ro.kernel.qemu"
2017-06-12 21:33:00 +00:00
Tao Bao
b65cf8e0ac
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours" into oc-dev-plus-aosp am: 7706a2fdd9
...
am: e8f0de6637
Change-Id: I3e4b52f016b96fec95b0b8d4c28936f4301b7cd3
2017-06-12 20:04:44 +00:00
Tao Bao
ac905b3b10
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours am: 869f48a256" into oc-dr1-dev-plus-aosp
...
am: af84c3d977
Change-Id: I4a4e9ffea720be37dff61e444a0d4c8fed86926a
2017-06-12 20:03:37 +00:00
Elliott Hughes
60acb5a0d4
Merge "Fix prctl argument type" am: 6cc5927e0d
am: 316b7334b8
am: 184fa60c23
...
am: 2daf8683f3
Change-Id: Ie556d1bfc87af2dd21326d0d7da7fe72f9f77a11
2017-06-12 20:03:05 +00:00
Tao Bao
e8f0de6637
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours" into oc-dev-plus-aosp
...
am: 7706a2fdd9
Change-Id: I7a3017bc5e23f6e2799ad979a26aadcf10ed8cbe
2017-06-12 20:01:58 +00:00
Android Build Merger (Role)
af84c3d977
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours am: 869f48a256" into oc-dr1-dev-plus-aosp
2017-06-12 20:00:29 +00:00
Elliott Hughes
2daf8683f3
Merge "Fix prctl argument type" am: 6cc5927e0d
am: 316b7334b8
...
am: 184fa60c23
Change-Id: Ibc96f273e17928f75148ab79c8a0aa1db166ba53
2017-06-12 20:00:05 +00:00
Tao Bao
c70b9917ba
Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours
...
am: 869f48a256
Change-Id: I1be94b7462977e93de5f63bafdd6e4be291bb95e
2017-06-12 20:00:05 +00:00
Android Build Merger (Role)
7706a2fdd9
Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours" into oc-dev-plus-aosp
2017-06-12 19:57:41 +00:00
Tao Bao
869f48a256
Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev
...
am: 642ca632f6
-s ours
Change-Id: Ice9637c768c0ef1bf60e603e31be3f5403c81aa3
2017-06-12 19:57:06 +00:00
Tao Bao
e57cc426e3
Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev
...
am: 642ca632f6
-s ours
Change-Id: I4dbc6a7e70277ddd910d28323d3c64aa28f8d4b0
2017-06-12 19:57:05 +00:00
Elliott Hughes
184fa60c23
Merge "Fix prctl argument type" am: 6cc5927e0d
...
am: 316b7334b8
Change-Id: Iaaf987d8b996a44a0b11eae3a1f1386adf721f3c
2017-06-12 19:56:56 +00:00
Elliott Hughes
316b7334b8
Merge "Fix prctl argument type"
...
am: 6cc5927e0d
Change-Id: Iee476e7734bde72bdaebf9d1643c4b3e60f2339e
2017-06-12 19:53:57 +00:00
Elliott Hughes
6cc5927e0d
Merge "Fix prctl argument type"
2017-06-12 19:48:23 +00:00
Tao Bao
642ca632f6
Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev
2017-06-12 19:39:53 +00:00
Nicolas Norvez
717f15353f
adbd: optionally use qemud pipe without ro.kernel.qemu
...
adbd currently decides to use the QEMUD pipe if ro.kernel.qemu=1, as set
for ranchu. The Android container in Chrome OS doesn't have that
property set and it can't be set to 1 because it's used as equivalent to
"runs inside an emulator" throughout Android and changes the way
graphics are handled, whether Bluetooth is supported, etc., behaviour
that we do not want to trigger in Chrome OS.
adbd now also checks service.adb.transport to decide whether to use the
QEMUD (goldfish) pipe.
adbd still first checks for ro.kernel.qemu to preserve existing
behaviour and will still fallback to TCP if it can't use Goldfish.
Bug: 38497992
Test: tested by jmgao@ -thanks!- on aosp_angler, adb still works.
Change-Id: I8370704145ae7301ac7aeef81c5cbd94cfcb7fd7
2017-06-12 12:22:32 -07:00
Tao Bao
98a73a2ce1
Revert "Load default prop from /system/etc/prop.default"
...
This reverts commit 810d71b005
.
init fails to read default.prop under recovery:
init: Couldn't load properties from /default.prop: Too many symbolic links encountered
Bug: 62525809
Change-Id: I1f84a18e545e1307dcb230be51606cca731667f9
2017-06-12 17:07:11 +00:00
Jiyong Park
b4929b2194
Merge "Don't allow libui.so to RS drivers." into oc-dr1-dev am: 1a7a5419d0
...
am: 5e4da5195f
Change-Id: I4c495f24ed4bab5fbca4f0d6432f8612ba2c6132
2017-06-12 02:11:45 +00:00
Jiyong Park
5e4da5195f
Merge "Don't allow libui.so to RS drivers." into oc-dr1-dev
...
am: 1a7a5419d0
Change-Id: I11189385fe1586f11ce8a325a2ecdfd69f5624f0
2017-06-12 02:08:46 +00:00
TreeHugger Robot
1a7a5419d0
Merge "Don't allow libui.so to RS drivers." into oc-dr1-dev
2017-06-12 02:04:21 +00:00
Bowgo Tsai
60b2bcaf5c
Merge "first stage mount: removing the restriction of mount points" into oc-dr1-dev am: 998e3b28ba
-s ours
...
am: 6ecd423882
-s ours
Change-Id: Ib3ee5ebfacfc93851918a18475fa0303461a7ed8
2017-06-10 11:46:55 +00:00
Bowgo Tsai
6ecd423882
Merge "first stage mount: removing the restriction of mount points" into oc-dr1-dev
...
am: 998e3b28ba
-s ours
Change-Id: I28c377951f5f7ff661fe1fff3228543ac2ae7cfc
2017-06-10 11:44:23 +00:00
TreeHugger Robot
998e3b28ba
Merge "first stage mount: removing the restriction of mount points" into oc-dr1-dev
2017-06-10 11:41:29 +00:00
Bowgo Tsai
cb0166b5dd
Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8
am: 95d78849b4
am: 3b0512b75c
...
am: fecd8c26cf
Change-Id: Id343ecda5001d72183cfe782217cb62e8dbe2716
2017-06-10 03:09:53 +00:00
Bowgo Tsai
fecd8c26cf
Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8
am: 95d78849b4
...
am: 3b0512b75c
Change-Id: I8d11be54322e57b9bf904907198b7058af7be4df
2017-06-10 03:07:09 +00:00
Bowgo Tsai
3b0512b75c
Merge "fs_mgr_verity: support updating actual block device path in verity table" am: 4c28ca1ac8
...
am: 95d78849b4
Change-Id: Iafd903aaaa22385c6d5c50a294fdca44bf399a24
2017-06-10 03:04:22 +00:00
Bowgo Tsai
95d78849b4
Merge "fs_mgr_verity: support updating actual block device path in verity table"
...
am: 4c28ca1ac8
Change-Id: I8f35a15f09518bc1757432004a5126c93d1b96ae
2017-06-10 03:02:21 +00:00
Treehugger Robot
4c28ca1ac8
Merge "fs_mgr_verity: support updating actual block device path in verity table"
2017-06-10 02:57:09 +00:00
Jiyong Park
9242f68c0d
Don't allow libui.so to RS drivers.
...
libui.so is not VNDK-SP, so it must not be allowed to RS drivers.
Bug: 37550338
Test: camerascript app works well in 2017 pixel devices
Change-Id: I34971baebdc91f11935d1eb4ddd07d89d4c38958
2017-06-09 17:38:28 +09:00
Hung-ying Tyan
026a220ec2
Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01
-s ours am: 8d87ae4794
...
am: 6f795616a8
Change-Id: I1171900e86d995772563d91516f5bc2f85a76b84
2017-06-09 08:18:46 +00:00
Hung-ying Tyan
1afcf1b543
Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01
-s ours am: fbdbbeff82
...
am: 63b84d2c29
Change-Id: I19aaac641db46c703ddaebcf9d6c18828a90ed5c
2017-06-09 08:17:17 +00:00
Hung-ying Tyan
6f795616a8
Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01
-s ours
...
am: 8d87ae4794
Change-Id: I5f1ec0968a7e53beb6fd7740f0aed0951988df4a
2017-06-09 08:15:55 +00:00
Hung-ying Tyan
63b84d2c29
Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01
-s ours
...
am: fbdbbeff82
Change-Id: I104ad2700415b253b561fe087745f2fc82b2a572
2017-06-09 08:14:46 +00:00
Hung-ying Tyan
8d87ae4794
Merge "Load default prop from /system/etc/prop.default" into oc-dev
...
am: 0af496af01
-s ours
Change-Id: Iba712935e81f5a11d524c889f9f7b0ba405f5283
2017-06-09 08:12:20 +00:00
Hung-ying Tyan
fbdbbeff82
Merge "Load default prop from /system/etc/prop.default" into oc-dev
...
am: 0af496af01
-s ours
Change-Id: I5b22d27c22a61ff71bd9046d7b9a88bc7a7e2f7e
2017-06-09 08:12:18 +00:00
Hung-ying Tyan
0af496af01
Merge "Load default prop from /system/etc/prop.default" into oc-dev
2017-06-09 08:04:36 +00:00
Hung-ying Tyan
810d71b005
Load default prop from /system/etc/prop.default
...
/default.prop is moved to /system/etc/prop.default for full Treblized
devices. Modifies property_service to load it from there first.
Bug: 37815285
Test: Tested with ag/2371424. Booted pixel phones, checked the location
of pro.default, verified the symlink at /default.prop, checked a
few properties via adb shell and manually tested a few apps.
Change-Id: I485231f21fc86b0aec58edf867e229a31e77d85e
2017-06-09 13:02:56 +08:00
Bowgo Tsai
81af8c7362
first stage mount: removing the restriction of mount points
...
Current first stage mount only allows three mount points: system, vendor
and/or odm. This was introduced by project Treble to mount those
verified partitions early. However, there might be some other custom
partitions needs to be mounted early as well. This CL removes the
restriction and does first stage mount for whatever specified in
fstab-dt.
Bug: 62423887
Test: first stage mount /vendor with vboot 1.0
Test: first stage mount /vendor with vboot 2.0 (AVB)
Change-Id: I6c146c64e673c35c2823523ccbde193590430c48
Merged-In: I6c146c64e673c35c2823523ccbde193590430c48
(cherry picked from commit 06ed613e73
)
2017-06-09 12:47:17 +08:00
Yifan Hong
d6bb83c42c
Mark libqemu_pipe vendor_available am: fabe549af1
...
am: 2a70f3f502
Change-Id: I73ddf135f840f1a7273fba7478d76bdf416b43a3
2017-06-09 02:44:19 +00:00
Yifan Hong
26129526e6
libqemu: Android.mk -> bp am: e250fd84db
...
am: 08f48c77e3
Change-Id: Ie7c24acbcd713768bb9aa6b9e95347547114c4fe
2017-06-09 02:44:12 +00:00
Yifan Hong
2a70f3f502
Mark libqemu_pipe vendor_available
...
am: fabe549af1
Change-Id: Ie4fc80dbea2a30692de77394020a4a28bd0d407f
2017-06-09 02:41:47 +00:00
Yifan Hong
08f48c77e3
libqemu: Android.mk -> bp
...
am: e250fd84db
Change-Id: I3b0d43304f3636fc9a252e26108511d5136c28e9
2017-06-09 02:41:41 +00:00
Bowgo Tsai
c3eca505cd
fs_mgr_verity: support updating actual block device path in verity table
...
The value of PRODUCT_{SYSTEM,VENDOR}_VERITY_PARTITION will be included
in the verity metadata of an image. For example:
PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor
This makes the image cannot be shared for devices with different by-name
prefix:
/dev/block/platform/soc.0/f9824900.sdhci/by-name/vendor
/dev/block/platform/soc.0/7824900.sdhci/by-name/vendor
This change supports using a generic PRODUCT_{SYSTEM,VENDOR}_VERITY_PARTITION to
build image and replace it with the actual path at run time:
PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor ==>
/dev/block/platform/soc.0/7824900.sdhci/by-name/vendor
Bug: 62171170
Test: Boot sailfish with PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor
Change-Id: I2789d2a025e80a628a1b4e7419818065c209fb7f
2017-06-09 10:02:42 +08:00
Bowgo Tsai
346e5a0e02
Merge "first stage mount: removing the restriction of mount points" am: 5218d69817
am: 7d491a0a7b
am: 7f6df5ddf9
...
am: 539518269d
Change-Id: I7f2324753078ea9f6c7fb63faebcf51922c464f6
2017-06-09 02:02:39 +00:00
Bowgo Tsai
539518269d
Merge "first stage mount: removing the restriction of mount points" am: 5218d69817
am: 7d491a0a7b
...
am: 7f6df5ddf9
Change-Id: I173bcf7f3989c38d4bf2b08d5cae627b5f47ffc4
2017-06-09 02:00:38 +00:00