Commit graph

30601 commits

Author SHA1 Message Date
Steven Moreland
5824abad4d Merge "Bluetooth hal: moved to vendor partition." am: 1e48879b6c
am: 109aa756c3

Change-Id: Ice9118a1d9d46100d434fb50e411476d8f1ff059
2017-02-28 04:06:10 +00:00
Steven Moreland
109aa756c3 Merge "Bluetooth hal: moved to vendor partition."
am: 1e48879b6c

Change-Id: I31882ff1aa217b3814972714cc89ab5f8e41d1a5
2017-02-28 04:04:06 +00:00
Treehugger Robot
1e48879b6c Merge "Bluetooth hal: moved to vendor partition." 2017-02-28 04:00:58 +00:00
Colin Cross
58021d15c9 Move adb_dirname and adb_basename to libbase
adb already provides an implementation of dirname and basename that
take and produce std::strings, move it into libbase so it can be
used in the implementation of GetExecutableDirectory.

Test: out/host/linux-x86/nativetest64/adb_test/adb_test
Test: out/host/linux-x86/nativetest64/libbase_test/libbase_test
Test: adb shell /data/nativetest64/libbase_test/libbase_test64
Change-Id: Ideb1627607b14562121316d4ed27fa6fb0930684
2017-02-27 18:18:31 -08:00
Bowgo Tsai
d11734e54c Merge "init: early_mount: removing hard-coded paths" am: f719c255fa am: 0d0519c98c
am: cd91377253

Change-Id: I1c5046b384ff5f1022e523dde95903878d33f83c
2017-02-28 01:39:10 +00:00
Bowgo Tsai
cd91377253 Merge "init: early_mount: removing hard-coded paths" am: f719c255fa
am: 0d0519c98c

Change-Id: Ia0e9b1c2980950772f0958e6d2c9929ae5812bc4
2017-02-28 01:36:51 +00:00
Steven Moreland
18676b2ca8 Bluetooth hal: moved to vendor partition.
Bug: 35328775
Test: works in both binderized and passthrough modes
Merged-In: I61f1ff6b777089d7aad5184c0aee4f653897b32e
Change-Id: I61f1ff6b777089d7aad5184c0aee4f653897b32e
2017-02-28 01:34:59 +00:00
Bowgo Tsai
0d0519c98c Merge "init: early_mount: removing hard-coded paths"
am: f719c255fa

Change-Id: I411e9fde0f78ad42386ab80506f40a30f7ba0848
2017-02-28 01:34:23 +00:00
TreeHugger Robot
68f95f715c Merge "Bluetooth hal: moved to vendor partition." 2017-02-28 01:30:07 +00:00
Treehugger Robot
f719c255fa Merge "init: early_mount: removing hard-coded paths" 2017-02-28 01:29:13 +00:00
TreeHugger Robot
390f926140 Merge changes from topic 'remove_cap'
* changes:
  libcutils: remove storaged caps
  storaged: reduce storaged privilege
2017-02-28 00:45:25 +00:00
Greg Hackmann
e33adfadcc Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137 am: dfbae6ddbb am: c2e2f36f63
am: af64d87de7

Change-Id: Ie1f120a2b714336fa659a51f25ae4df196cf7e1e
2017-02-28 00:19:19 +00:00
Greg Hackmann
af64d87de7 Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137 am: dfbae6ddbb
am: c2e2f36f63

Change-Id: Ice1c89ed2bad57433e99638d268cecbba2c9e2a3
2017-02-28 00:17:17 +00:00
Greg Hackmann
c2e2f36f63 Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137
am: dfbae6ddbb

Change-Id: Ie64621b4538ca8fd798056e4970241ca0c5ba2ea
2017-02-28 00:14:49 +00:00
Greg Hackmann
f25b1a167c Merge changes Ie9dd5d5d,Ifc6038c1 am: 0cde0eae09 am: 5fb6ef6b7a
am: 781f164289

Change-Id: I8a7c02b633349bbda689f5832ec8eadaaebc70d9
2017-02-28 00:14:47 +00:00
Greg Hackmann
781f164289 Merge changes Ie9dd5d5d,Ifc6038c1 am: 0cde0eae09
am: 5fb6ef6b7a

Change-Id: I4e64339b6baec89747301d94ac38445b08f5f6de
2017-02-28 00:12:47 +00:00
Treehugger Robot
dfbae6ddbb Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137
* changes:
  libcutils: build tests with -Wall -Wextra -Werror
  libcutils: fix socket type in SocketsTest.TestGetLocalPort
  libcutils: fix Wsign-compare warnings in multiuser_test
2017-02-28 00:11:07 +00:00
Greg Hackmann
5fb6ef6b7a Merge changes Ie9dd5d5d,Ifc6038c1
am: 0cde0eae09

Change-Id: Ie402e720388b35daed0f704992686f4b84bc5736
2017-02-28 00:10:47 +00:00
Treehugger Robot
0cde0eae09 Merge changes Ie9dd5d5d,Ifc6038c1
* changes:
  libadf: convert to C++
  libadf: adf_test: fix crash on adf.devices failure
2017-02-28 00:07:52 +00:00
Steven Moreland
d0a19a6487 Bluetooth hal: moved to vendor partition.
Bug: 35328775
Test: works in both binderized and passthrough modes
Change-Id: I61f1ff6b777089d7aad5184c0aee4f653897b32e
2017-02-27 15:41:48 -08:00
Alex Klyubin
b914f3f835 Merge "Make secilc accessible by root only" am: e803818832 am: 94259da99f
am: 97c93b48ab

Change-Id: I4cb11522ed51aa08afb3e49976ab765641a1a613
2017-02-27 23:27:58 +00:00
Alex Klyubin
97c93b48ab Merge "Make secilc accessible by root only" am: e803818832
am: 94259da99f

Change-Id: I5c53876accf770aca99b5f70ea4ab26e0a2ac115
2017-02-27 23:25:54 +00:00
Alex Klyubin
94259da99f Merge "Make secilc accessible by root only"
am: e803818832

Change-Id: I66c3bcf5f853ba90f1edcb6fb68d8d643cd25acf
2017-02-27 23:23:50 +00:00
Treehugger Robot
e803818832 Merge "Make secilc accessible by root only" 2017-02-27 23:20:59 +00:00
Ryan Campbell
0b36473272 Add global GCOV_PREFIX option.
When native coverage is enabled, add a global GCOV_PREFIX
environment variable specifying that gcda files be output
with path prefix /data/local/tmp.

Bug: 35635587
Test: make NATIVE_COVERAGE=true; check init.environ.rc
Change-Id: I40972aea3ca3168d0687bdc93e9d4b7b3a1071b9
2017-02-27 15:00:18 -08:00
Sandeep Patil
23e7f86d36 Merge "fs_mgr: make is_device_secure() work even in the absence of properties." am: 0026f1e693 am: 5cdbcbbcbf
am: 8207bd8486

Change-Id: Idb8fb584b38914d1c510737716e1eff6e70b0f65
2017-02-27 22:49:11 +00:00
Sandeep Patil
8207bd8486 Merge "fs_mgr: make is_device_secure() work even in the absence of properties." am: 0026f1e693
am: 5cdbcbbcbf

Change-Id: Ifa3a00067902ab542817cf6b0008a07a28899210
2017-02-27 22:47:11 +00:00
Sandeep Patil
5cdbcbbcbf Merge "fs_mgr: make is_device_secure() work even in the absence of properties."
am: 0026f1e693

Change-Id: I9646c86bbed9a4da3b976d319549621fb7a16974
2017-02-27 22:45:10 +00:00
Treehugger Robot
0026f1e693 Merge "fs_mgr: make is_device_secure() work even in the absence of properties." 2017-02-27 22:42:33 +00:00
Alex Klyubin
3380927e71 Make secilc accessible by root only
There's no reason for SELinux policy compiler to be accessible by
anybode other than root.

Test: Device boots -- secilc isn't used yet anyway
Bug: 31363362
Change-Id: I26cf34f1412b8dd471f79271c491b473617a6df6
2017-02-27 13:27:58 -08:00
Jin Qian
135f161bae libcutils: remove storaged caps
Test: adb shell dumpsys storaged --force
Bug: 35323867
Change-Id: Ia58e5aa24885dcf56f8c4bec9dc15d0f3b4c3f4f
2017-02-27 12:54:32 -08:00
Jin Qian
f97e6e7dd4 storaged: reduce storaged privilege
Remove storaged from system group.
Let init set priority based on rc file.

Test: adb shell dumpsys storaged --force
Bug: 35323867
Change-Id: I9d893ec69d9cc34a9e24f47166384efd7ef4d9d2
2017-02-27 12:52:04 -08:00
Sandeep Patil
e7a1b3757f fs_mgr: make is_device_secure() work even in the absence of properties.
During early mount property area is not initialized, and as a result an
'eng' build will always incorrectly be detected as a 'secure' build by
early mount code path resulting into verity error and consequent boot
loop.

The change here makes sure the is_device_secure() check works with /
without properties based on the 'eng' build based build flag so the
early mount code works fine both ways.

Bug: 35791581
Bug: 27805372

Test: Boot sailfish-{eng,userdebug} builds successfully w/ early
mount enabled

Change-Id: Icd101ccad56b669f49b60bbb3005d5be9f53b02b
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-02-27 12:46:18 -08:00
Connor O'Brien
bbcf719f9a libmemtrack: check return value for getMemory()
libmemtrack does not report an error when the binderized memtrack
service dies during a call to getMemory, so a crash in the memtrack
service can result in the calling process (e.g. system_server)
crashing as well. Add an error check to avoid this problem.

Bug: 35728498
Test: adb shell kill -9 $(adb shell pidof android.hardware.memtrack@1.0-service)
Change-Id: I852d8dfcbc1c92a95f8fe249b607dea8eb01f06a
Signed-off-by: Connor O'Brien <connoro@google.com>
2017-02-27 12:21:39 -08:00
Bowgo Tsai
d4beed22e8 init: early_mount: removing hard-coded paths
Current early mount has some hard-coded paths that are not easy to extend
when we switch verified boot to AVB (external/avb/libavb). This CL uses some
C++ containers to replace those fixed paths.

Bug: 33254008
Test: early mount /vendor with dm-verity on sailfish
Test: early mount /vendor without dm-verity on sailfish
Test: early mount /vendor with dm-verity on bullhead

Change-Id: I32a22fe486d7649e33bb23c9018ddc0428df6069
2017-02-27 13:09:06 +08:00
Wei Wang
eebe07c539 Merge "fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount" am: 7a5d535cd2 am: be838ae027
am: 771f642d89

Change-Id: Ie8cd01116a1f0437eee80168dc5f6aa57b08fa55
2017-02-25 05:23:40 +00:00
Wei Wang
771f642d89 Merge "fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount" am: 7a5d535cd2
am: be838ae027

Change-Id: I0ce99e223f7984e8373e77b8eaa5ff419529fccb
2017-02-25 05:17:23 +00:00
Wei Wang
be838ae027 Merge "fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount"
am: 7a5d535cd2

Change-Id: I13b2cc4c792f8165d81d503eefc9d86e93ba7903
2017-02-25 05:14:55 +00:00
Treehugger Robot
7a5d535cd2 Merge "fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount" 2017-02-25 05:11:04 +00:00
Wei Wang
4d71bc5350 fs_mgr: fix const parameter in fs_mgr_do_tmpfs_mount
Bug: 35425974
Test: mma, marlin/angler boot
Change-Id: Ibadd04ad3a7c4ea184a6344d566302d577d8fee3
2017-02-24 19:33:53 -08:00
Jaekyun Seok
ef99ced7f8 Merge "Treblize init.rc location" am: 76e9a180a8 am: 9afcdc825d
am: 19e3517a91

Change-Id: If71b2951ff92f83c61c175a03923085c0ea38edd
2017-02-25 02:55:57 +00:00
Jaekyun Seok
19e3517a91 Merge "Treblize init.rc location" am: 76e9a180a8
am: 9afcdc825d

Change-Id: I08ef758c9c6e36b7ec31d84c782d160d07c6b427
2017-02-25 02:52:56 +00:00
Jaekyun Seok
9afcdc825d Merge "Treblize init.rc location"
am: 76e9a180a8

Change-Id: I8415b555308b8ad489413f9e99f6e73ee9caa17e
2017-02-25 02:50:32 +00:00
Treehugger Robot
76e9a180a8 Merge "Treblize init.rc location" 2017-02-25 02:41:29 +00:00
Elliott Hughes
756aee2064 Merge "Add cross-platform <android-base/endian.h>." am: 8a16081fa1 am: 5498d39b84
am: 3a93b57b7d

Change-Id: Ibaa351a7dcf5a62e27669256ec353d62c64d686f
2017-02-25 02:22:14 +00:00
Elliott Hughes
3a93b57b7d Merge "Add cross-platform <android-base/endian.h>." am: 8a16081fa1
am: 5498d39b84

Change-Id: Iaf4d1b25eaf9662d475ba8f10845e07931326bf1
2017-02-25 02:19:12 +00:00
Elliott Hughes
5498d39b84 Merge "Add cross-platform <android-base/endian.h>."
am: 8a16081fa1

Change-Id: I6306de56d135fbc8666648b919432abe5ad05006
2017-02-25 02:16:56 +00:00
Elliott Hughes
8a16081fa1 Merge "Add cross-platform <android-base/endian.h>." 2017-02-25 02:07:05 +00:00
TreeHugger Robot
3d0d6b380f Merge "gatekeeper HAL uses "default" service name" 2017-02-24 23:21:58 +00:00
Sandeep Patil
ddfe01281a Merge changes from topic 'fs_mgr_dt' am: dbb40b64e9 am: ad384fc992
am: 50eb15a0d0

Change-Id: I4c8784610d0d41c3807851c516e3ef59388ca70f
2017-02-24 23:10:30 +00:00