Commit graph

28594 commits

Author SHA1 Message Date
Keun-young Park
e3d4615f80 Merge "add base::WaitForPropertyCreation"
am: 22a64b3a8a

Change-Id: I19719bf134fbd23a5473ecdeecc049c78a727028
2017-02-28 22:42:14 +00:00
Keun-young Park
bba9f8a9b2 Merge "set ro.boottime.persistent_properties when persisted props are restored"
am: 73c6544b08

Change-Id: I97c564b93fbc37a898ca937f2d28f372c6687fe7
2017-02-28 22:42:08 +00:00
Keun-young Park
22a64b3a8a Merge "add base::WaitForPropertyCreation" 2017-02-28 22:39:41 +00:00
Keun-young Park
73c6544b08 Merge "set ro.boottime.persistent_properties when persisted props are restored" 2017-02-28 22:39:41 +00:00
Mark Salyzyn
119933f0a4 Merge "liblog: event log tags cache miss call logd for update"
am: 364bf6db00

Change-Id: Iec62a14af4d213caf4a26b838c8d5e74edb898be
2017-02-28 22:26:35 +00:00
Mark Salyzyn
364bf6db00 Merge "liblog: event log tags cache miss call logd for update" 2017-02-28 22:24:17 +00:00
Mark Salyzyn
2a0044e4b0 liblog: event log tags cache miss call logd for update
Deal with cache miss in the event tag map resources and switch to
"Plan B" to ask long-path to logd for a determination on the tag,
name and format.

logcat-unit-tests liblogcat.descriptive does an under-the-hood call
to logd to add a new logtag but the in-process mapping fails to
pick it up because the /dev/event-tag-map map is SHARED PRIVATE for a
few moments to garner some (linux) efficiency with other copies that
are in the process.  Without the workaround of marking the mapping
dirty to be reread, we are using this change as the proper workaround
that fixes the later parts of this test.

Test: gTest logcat-unit-tests --gtest_filter=liblogcat.descriptive
Bug: 31456426
Bug: 35326290
Change-Id: Ibe54d4df00ed92248e1e644ecebc95f60b222b4d
2017-02-28 14:23:18 -08:00
Colin Cross
9ece9401a4 Merge changes I975ba933,Ica9d211b
am: a9ef4dc7a2

Change-Id: I4e4effd0176bab0eff9b970702eac12fce3d69c5
2017-02-28 20:32:31 +00:00
Colin Cross
a9ef4dc7a2 Merge changes I975ba933,Ica9d211b
* changes:
  Add tests for multiton issue
  Add GetExecutableDirectory to libbase
2017-02-28 20:29:17 +00:00
Keun-young Park
e2d986daa6 add base::WaitForPropertyCreation
- unlike base::WaitForProperty, which waits for specific value to
  be set, this one only waits until the property is created.

bug: 35178781
Test: added unit test
Change-Id: Idbf98c2152fe768357302f6b69310c55305f5d54
2017-02-28 12:08:54 -08:00
Keun-young Park
7d3202650d set ro.boottime.persistent_properties when persisted props are restored
- allows components relying on persisted props to wait for this property.

bug: 35178781
Test: reboots
Change-Id: I06cbf2a6b375654fcc277a2699fceeb23846a241
2017-02-28 11:31:54 -08:00
Mark Salyzyn
38d33010d0 Merge "liblogcat: measure performance"
am: 8a3a166066

Change-Id: I2b294ea7477a079ee3f6d35f5fc6e7a4c8592196
2017-02-28 17:25:15 +00:00
Treehugger Robot
8a3a166066 Merge "liblogcat: measure performance" 2017-02-28 17:18:46 +00:00
Mark Salyzyn
e69148271c Merge "liblogcat: add simple stdout redirection"
am: 1f8aa4cffd

Change-Id: Id1944628c42ae21b4514a3cb314c5f9df8d12934
2017-02-28 17:13:47 +00:00
Treehugger Robot
1f8aa4cffd Merge "liblogcat: add simple stdout redirection" 2017-02-28 17:06:13 +00:00
Colin Cross
a0931ebd64 Add tests for multiton issue
Test accessing a singleton from two libraries, the second of which
depends on the first but is dlopen'd after the first is already
loaded.

Bug: 35674422
Test: out/host/linux-x86/nativetest64/libutils_tests/libutils_tests
Change-Id: I975ba933a19b941a52bdb6e9c221a6910ffb8081
2017-02-28 16:34:35 +00:00
Colin Cross
bb3a515f46 Add GetExecutableDirectory to libbase
Tests will often want to get the executable directory in order to
find test data.

Test: out/host/linux-x86/nativetest64/libbase_tests/libbase_tests
Change-Id: Ica9d211bcd039fcf83a22fd494816abd01b97aa3
2017-02-28 16:34:04 +00:00
Colin Cross
e5dd37ec35 Merge "Move adb_dirname and adb_basename to libbase"
am: 5a8db38b01

Change-Id: Ie0eaffca15f0e85c9134352a09f2dab919801da7
2017-02-28 07:31:43 +00:00
Treehugger Robot
5a8db38b01 Merge "Move adb_dirname and adb_basename to libbase" 2017-02-28 07:28:54 +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
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
f719c255fa Merge "init: early_mount: removing hard-coded paths" 2017-02-28 01:29:13 +00:00
Greg Hackmann
c2e2f36f63 Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137
am: dfbae6ddbb

Change-Id: Ie64621b4538ca8fd798056e4970241ca0c5ba2ea
2017-02-28 00:14:49 +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
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
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
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
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
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
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
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
Jaekyun Seok
4ec72cc25f Treblize init.rc location
Treblization requires to locate partner-specific modules in its own
partition. So their own init.rc file could be located in /odm or
/vendor.
This CL is to support those locations for the init.rc.
Additionally thic CL modified import parser to support importing a
relative path.

Test: building succeeded and tested on sailfish with enabling early
mount.
Bug: 35269867

Change-Id: I1bce924a32c8a2b53fb5d981d35d758cf9ddd9a6
2017-02-25 08:06:12 +09:00
Sandeep Patil
ad384fc992 Merge changes from topic 'fs_mgr_dt'
am: dbb40b64e9

Change-Id: I8e54aecb4825f4adc3fd92ceff1da76e1c4b227b
2017-02-24 23:05:00 +00:00
Treehugger Robot
dbb40b64e9 Merge changes from topic 'fs_mgr_dt'
* changes:
  fs_mgr: refactor: consolidate device tree file reading in one place
  fs_mgr: consolidate DT compatible check
2017-02-24 23:01:08 +00:00
Elliott Hughes
1dbd976200 Add cross-platform <android-base/endian.h>.
Bionic has <sys/endian.h>, glibc <endian.h>, and macOS and Windows have
nothing. This has often been annoying.

Bug: N/A
Test: new tests
Change-Id: I2a40c570df6a9bb30607ace1af653265938cc4b8
2017-02-24 14:03:36 -08:00
Sandeep Patil
4cd9a46916 fs_mgr: refactor: consolidate device tree file reading in one place
If Device tree values are read for comparison, they produce false
negatives with std::strings due to trailing '\0'. This change
consolidates the triming of trailing null into a single helper function
to be used everywhere fs_mgr reads DT values for comparison or other
reasons where it wishes to have the trailing null trimmed.

b/27805372

Test: Boot sailfish w/ early mount /vendor

Change-Id: If71efc830dc440323df764c7461867e71ed6515b
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-02-24 13:29:33 -08:00
Sandeep Patil
e396c607ff fs_mgr: consolidate DT compatible check
Fixes the compatible check in fs_mgr_boot_config by consolidating the
check in a single privately exported function within fs_mgr (i.e.
is_dt_compatible()).

b/27805372

Test: Boot sailfish w/ early mount

Change-Id: Ie2d1646b81cf9eba8d16828ca8cf2c75156c294c
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-02-24 13:29:26 -08:00
Colin Cross
a05a666c01 Merge "Make libutils test compile on the host"
am: f5fd4888ce

Change-Id: Id45309c93a25cba0aa632757eebee341d2dc8d98
2017-02-24 21:19:52 +00:00