Commit graph

51594 commits

Author SHA1 Message Date
Mark Salyzyn
1cb55cff36 Merge "fs_mgt: Fix remount failure in case of non-overlayfs system" am: 09bbdcb6b3
am: 8e54c6e8c1

Change-Id: I7a00b43d50ef28e425ecc643e18637ef1cb3f465
2019-07-29 14:15:09 -07:00
Mark Salyzyn
8e54c6e8c1 Merge "fs_mgt: Fix remount failure in case of non-overlayfs system"
am: 09bbdcb6b3

Change-Id: I0e45d40a6a134de072edbc2c05723d0f36e3e409
2019-07-29 13:29:59 -07:00
Treehugger Robot
09bbdcb6b3 Merge "fs_mgt: Fix remount failure in case of non-overlayfs system" 2019-07-29 19:30:12 +00:00
Jiyong Park
0decefedc8 Merge "Use android::base::Result in libnativeloader" am: 244d9b8fb9
am: 249756d200

Change-Id: I00fbc6ac4a34b9df8a76743f7e9902497357beeb
2019-07-27 07:38:21 -07:00
Jiyong Park
249756d200 Merge "Use android::base::Result in libnativeloader"
am: 244d9b8fb9

Change-Id: I0e9aacfbca82f615e58e100d43963b9869c53cd9
2019-07-27 07:29:24 -07:00
Treehugger Robot
244d9b8fb9 Merge "Use android::base::Result in libnativeloader" 2019-07-27 14:07:44 +00:00
Mark Salyzyn
588fe9e8af fs_mgt: Fix remount failure in case of non-overlayfs system
$ adb remount
W DM_DEV_STATUS failed for scratch: No such device or address
E Can not mount overlayfs for partitions: No such file or directory
/system/bin/remount exited with status 8
remount failed

Bug: 138407617
Test: $ adb remount

Change-Id: I0f359071234b57324ad2324905b5239dbfa44d01
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2019-07-26 13:46:41 -07:00
Jiyong Park
dae6785ca2 Merge "Don't fail catastrophically on non-existing namespace" am: d11603646a
am: b931f21570

Change-Id: Ic89c556b8bb40e89f2038472742437e1c38b3279
2019-07-26 08:16:41 -07:00
Jiyong Park
b931f21570 Merge "Don't fail catastrophically on non-existing namespace"
am: d11603646a

Change-Id: I66a77643cae8a2652c1361215e6b10a30e45b96c
2019-07-26 08:06:41 -07:00
Treehugger Robot
d11603646a Merge "Don't fail catastrophically on non-existing namespace" 2019-07-26 14:50:33 +00:00
Elliott Hughes
f7c02fa5dd Merge "Include ldd in /system/bin." am: 485d024b05
am: 9b106fa063

Change-Id: If6662ed54788055d2402b54dc01efbb1e18b5092
2019-07-25 17:53:42 -07:00
Elliott Hughes
9b106fa063 Merge "Include ldd in /system/bin."
am: 485d024b05

Change-Id: I229efc8e46c796c670adc094d68788e67dca1bb9
2019-07-25 17:44:38 -07:00
Treehugger Robot
485d024b05 Merge "Include ldd in /system/bin." 2019-07-25 23:34:45 +00:00
Jiyong Park
09db2edb45 Don't fail catastrophically on non-existing namespace
When a new namespace is added to ld.config.txt, it has to be reflected
to native_loader_test.cpp. However, failing to do so crashes the test
instead of showing an error message that the namespace hasn't been
added.

Fixing the issue by not returning nullptr when the namespace isn't
found.

Bug: 138304345
Test: libnativeloader_test
Change-Id: I9eee1293956caac69f95a946604a2e6f665bde89
2019-07-26 08:14:09 +09:00
Yifan Hong
86c3f26d88 Merge changes Ifc4c4540,I4636de85 am: 37602ed83e
am: 14c2deab0f

Change-Id: Ib3e0eadbb64381854038a00730de97288aef7154
2019-07-25 16:12:25 -07:00
Jiyong Park
8f4afc8298 Use android::base::Result in libnativeloader
Remove the out parameters for error messages using Result<T>.

Bug: 130388701
Test: libnativeloader_test
Change-Id: Idbaf391c183fb20d5e1d7c96f3a4ccbf9745b7e6
2019-07-26 08:06:46 +09:00
Yifan Hong
14c2deab0f Merge changes Ifc4c4540,I4636de85
am: 37602ed83e

Change-Id: Iaf61e0b1ec9d6421da7600e1ece5b4b4fe223fc2
2019-07-25 16:01:26 -07:00
Tri Vo
541d4253b8 Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" am: b4b9d21bf9
am: 359d910373

Change-Id: I7e3274d4d3a550d500fd36fff7d5eb28985bf236
2019-07-25 15:50:33 -07:00
Yifan Hong
37602ed83e Merge changes Ifc4c4540,I4636de85
* changes:
  MetadataBuilder::IsABDevice: make static / use std::optional
  MetadataBuilder::NewForUpdate: check sysprop instead
2019-07-25 22:43:35 +00:00
Tri Vo
359d910373 Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices"
am: b4b9d21bf9

Change-Id: I22baa14ff5135b22d574ba5b1587802c5f8e2ebf
2019-07-25 15:39:35 -07:00
Treehugger Robot
b4b9d21bf9 Merge "VtsKernelMemInfoTest: only enforce on Q+ launching devices" 2019-07-25 22:03:20 +00:00
Elliott Hughes
82033660c0 Include ldd in /system/bin.
Test: `which ldd`
Change-Id: I68a2e5402a82f22e7b715ab3d8ac2c09296b4376
2019-07-25 12:47:34 -07:00
Tian Baofeng
eb60857be2 Merge "Logcatd: remove some extra logic" am: 59772de0f0
am: 1fadcb6e80

Change-Id: I3df579fb4e1dc9cc51bdc8cd90c5a45a08a611eb
2019-07-25 11:49:17 -07:00
Yifan Hong
d769c964fb Merge changes from topic "charger_props" am: 7cea50acd8
am: 958216c97f

Change-Id: I6b16ee85bf321bbda9d53670314926f621168b95
2019-07-25 11:48:27 -07:00
Tian Baofeng
1fadcb6e80 Merge "Logcatd: remove some extra logic"
am: 59772de0f0

Change-Id: I2a3968842c7055f685a5d708beebcbb6a34d6ce7
2019-07-25 11:37:02 -07:00
Yifan Hong
958216c97f Merge changes from topic "charger_props"
am: 7cea50acd8

Change-Id: Ie5eeaa55a3749e2a155010aecf37ecacb43a7e88
2019-07-25 11:35:44 -07:00
Treehugger Robot
59772de0f0 Merge "Logcatd: remove some extra logic" 2019-07-25 18:29:43 +00:00
Jiyong Park
6660e62cc2 Merge "Fix libnativeloader_test" am: 865f6df8d4
am: 696593fd9b

Change-Id: I31fed2081fbf4c4fd1e55e5ae006f15f5847c15c
2019-07-25 11:23:19 -07:00
Yifan Hong
7cea50acd8 Merge changes from topic "charger_props"
* changes:
  healthd: Convert libhealthd_{draw,charger} to Soong.
  healthd: charger use runtime sysprops instead.
  healthd: remove unused variable.
2019-07-25 18:20:22 +00:00
Jiyong Park
696593fd9b Merge "Fix libnativeloader_test"
am: 865f6df8d4

Change-Id: I1a2803c8e5bdc16bc8101539ab24fcc2ec30f3be
2019-07-25 11:13:42 -07:00
Treehugger Robot
865f6df8d4 Merge "Fix libnativeloader_test" 2019-07-25 17:40:44 +00:00
Jiyong Park
e447335f81 Fix libnativeloader_test
Just before the test is enabled, the neuralnetwork namespace was added
by https://android-review.googlesource.com/c/platform/system/core/+/1014637.
This is breaking the libnativeloader_test.

Fix the test by adding the code for the new namespace.

Bug: 138304345
Test: libnativeloader_test on aosp_cf_x86_phone
Change-Id: Ifa762e395a3b9b5debdbcfcbcb395eeda3a1b2a4
2019-07-25 22:58:09 +09:00
Kiyoung Kim
3778a88cb0 Merge "Add libraries txt file to build target" am: becbf6cb5f
am: 7e48c78a82

Change-Id: Ib683165c48b76f2811125c64a2a041cf85e3ed46
2019-07-25 03:53:18 -07:00
Kiyoung Kim
7e48c78a82 Merge "Add libraries txt file to build target"
am: becbf6cb5f

Change-Id: Idb3ea1628ad7d46c60a66fb32954e83dc324f94a
2019-07-25 03:43:24 -07:00
Treehugger Robot
becbf6cb5f Merge "Add libraries txt file to build target" 2019-07-25 10:29:39 +00:00
Tian Baofeng
8415a5c45e Logcatd: remove some extra logic
There will be some unnecessary error logs caused
by extra logic was reported by init when some properties
were set default values. This patch remove these logic
codes to remove these avoidable error logs.

Bug: 137567691
Test: Can use logcat -r -n with configures

Change-Id: I9b8fa2025bcbef5d39438a8243f9ff5dc0a645df
Signed-off-by: Tian, Baofeng <baofeng.tian@intel.com>
Signed-off-by: Duan, YayongX <yayongx.duan@intel.com>
2019-07-25 06:27:36 +00:00
Yifan Hong
1d48575927 Merge "fs_mgr: liblp test: give ownership of environment to gtest" am: 08c6d1a5d1
am: 6a4c7385af

Change-Id: Iaee10178c5055a570165e5c7f908e021145951b1
2019-07-24 21:11:54 -07:00
Yifan Hong
6a4c7385af Merge "fs_mgr: liblp test: give ownership of environment to gtest"
am: 08c6d1a5d1

Change-Id: I115addc55de3b3cc67f935d866ac3e5d0fa4a039
2019-07-24 20:52:37 -07:00
Treehugger Robot
08c6d1a5d1 Merge "fs_mgr: liblp test: give ownership of environment to gtest" 2019-07-25 03:36:46 +00:00
Mark Salyzyn
014328559a Merge "Update overlayfs patch series reference" am: 3a970945c9
am: ea30c45dbf

Change-Id: I9964e0476feb3661898a1df99e4eac6deca04f4d
2019-07-24 17:38:31 -07:00
Mark Salyzyn
ea30c45dbf Merge "Update overlayfs patch series reference"
am: 3a970945c9

Change-Id: I629dffc3bae2acf8b684f019c17ec70d7a389dab
2019-07-24 17:27:47 -07:00
Yifan Hong
7bf1e9f459 fs_mgr: liblp test: give ownership of environment to gtest
From gtest doc:
Note that googletest takes ownership of the registered environment objects. Therefore do not delete them by yourself.

Test: run it
Change-Id: I275884ddd63a17097c3ea4d9d6bb2b5291dc8c90
2019-07-25 00:20:25 +00:00
Yifan Hong
f0dd120793 MetadataBuilder::IsABDevice: make static / use std::optional
Align with hat sRetrofitDap does.

Test: liblp_test_static
Change-Id: Ifc4c45404369a4eb18c02fc6a0ede938da5809b8
2019-07-24 17:19:06 -07:00
Yifan Hong
9d0e6cdfef MetadataBuilder::NewForUpdate: check sysprop instead
Check the value of ro.boot.dynamic_partitions_retrofit instead of
checking the name of the super partition being 'super' is a more
reliable way of determining retrofit DAP devices.

Some devices launch with DAP (e.g. cuttlefish) doesn't have "super"
as the super partition name. When Virtual A/B is implemented on
cuttlefish, update_engine calls NewForUpdate for the current super
partition metadata. Hence, this code needs to check the retrofit
sysprop instead.

Also, renamed IsRetrofitDevice to IsRetrofitMetadata to avoid the
confusion.

Test: OTA on retrofit DAP device
Test: OTA on launch DAP device
Test: liblp_test_static
Change-Id: I4636de854734df1bb61779d9a955217e89fdb2fd
2019-07-24 17:19:06 -07:00
Treehugger Robot
3a970945c9 Merge "Update overlayfs patch series reference" 2019-07-25 00:09:28 +00:00
Yifan Hong
dbaa477a70 healthd: Convert libhealthd_{draw,charger} to Soong.
Converting charger to Soong, one step at a time.

In the meantime, drop the use of BOARD_*/TARGET_* variables
in Android.mk because runtime sysprops will be used instead.
Libraries / binaries will always link to libminui / libpng /
libsuspend.

charger{.recovery,} can't be converted to Soong yet because
of the use of HAL_STATIC_LIBRARIES (Bug 127677771).

charger_test isn't converted because of the shared list
of CHARGER_{STATIC,SHARED}_LIBRARIES.

Bug: 124118169
Test: run charger on walleye

Change-Id: I355deda14e5b5c9938256ff0b778590ac0191095
2019-07-24 17:01:40 -07:00
Yifan Hong
97eecdc875 healthd: charger use runtime sysprops instead.
Bug: 124118169
Test: run off-mode charging
Change-Id: Ib71f84f1c93d1566f4e3101920d98b1d39184390
2019-07-24 17:01:40 -07:00
Yifan Hong
dcbaeef6e3 healthd: remove unused variable.
Test: builds
Change-Id: If12cfd31353cd26b41c1c07f44761cea3c46c34a
2019-07-24 17:01:40 -07:00
Tom Cherry
b3da4feb5a Merge "init: simplify keyword_map" am: 3af3fcce45
am: 6ce842e335

Change-Id: If5d6897b10288388d82e7e377b2e5e646ce8bd2d
2019-07-24 15:24:05 -07:00
Tom Cherry
6ce842e335 Merge "init: simplify keyword_map"
am: 3af3fcce45

Change-Id: I388b9417dbb6988db59d192c8071900d317c17dc
2019-07-24 15:12:28 -07:00