Tao Bao
17f5b296d1
Merge "Reland "Build and use minadbd as a shared library."" am: 337bd80b78 am: 7785eec4f2
...
am: d991adf087
Change-Id: I9c63a13fc65a327ebbcbc50464620b1bf7cfd05c
2018-08-13 16:39:46 -07:00
Tao Bao
d991adf087
Merge "Reland "Build and use minadbd as a shared library."" am: 337bd80b78
...
am: 7785eec4f2
Change-Id: I198839ac58fd4713f1f4e73f096631be7f4e991e
2018-08-13 16:13:16 -07:00
Tao Bao
7785eec4f2
Merge "Reland "Build and use minadbd as a shared library.""
...
am: 337bd80b78
Change-Id: Iae00627d92cc7761afe1d99005287284793bbaa8
2018-08-13 16:07:18 -07:00
Tao Bao
337bd80b78
Merge "Reland "Build and use minadbd as a shared library.""
2018-08-13 22:52:56 +00:00
Colin Cross
b9e791a4e1
Merge "Remove TODO for b/112462307" am: 1914bd0f4b am: a681afc358
...
am: d5b39787c8
Change-Id: I3a7a241660c3016c6215e56f0da9a94aff222b2a
2018-08-13 15:32:46 -07:00
Colin Cross
d5b39787c8
Merge "Remove TODO for b/112462307" am: 1914bd0f4b
...
am: a681afc358
Change-Id: I4975cdfdf909ca64d027400678bda0ec9153db39
2018-08-13 15:29:00 -07:00
Colin Cross
a681afc358
Merge "Remove TODO for b/112462307"
...
am: 1914bd0f4b
Change-Id: I2debb7e2402a48a291cc20a9714370b17bcf9392
2018-08-13 14:11:23 -07:00
Tao Bao
7d2a63afe1
Reland "Build and use minadbd as a shared library."
...
This relands the previously reverted CL in commit
c70446ce7b ("Build and use minadbd as a
shared library."). `recovery` has been built with Soong, so the previous
concern (unintentionally installing `libminadbd_services.so` to normal
system image) no longer holds.
Note that `reocvery` can't use `libminadbd_services.a`, as functions
like `daemon_service_to_fd()` (needed by `libadbd.so`) won't be linked
into `recovery`.
This CL moves the dependency of `libminadbd_services` from `librecovery`
into `recovery`, as only the latter actually relies on it (via
`recovery_main.cpp`). Note that we no longer need to list the transitive
dependency on `libadbd` or `libasyncio`.
Bug: 112494634
Test: `mmma -j bootable/recovery`
Test: Build and boot into recovery with aosp_taimen-userdebug. Verify that
sideloading keeps working.
Test: `build/soong/build_test.bash --dist`
Change-Id: Ic086470b86d6770bede317e0f5534f608fa7b7d2
2018-08-13 14:09:58 -07:00
Colin Cross
1914bd0f4b
Merge "Remove TODO for b/112462307"
2018-08-13 21:02:58 +00:00
Colin Cross
f27ca7eff6
Remove TODO for b/112462307
...
b/112462307 is fixed now, remove the TODO.
Bug: 112462307
Test: dexlist out/soong/.intermediates/bootable/recovery/updater_sample/SystemUpdaterSample/android_common/dex/classes.dex | grep getUpdaterState
Change-Id: I19cb93a74b714967e4bab2964e229a0ab0a15676
2018-08-13 12:38:28 -07:00
Tao Bao
7fb30ac80b
Merge "Build recovery with Soong." am: df264e0186 am: 24b16491db am: 287ce6ebea
...
am: 96e8544a52
Change-Id: Iba5939fa1bcfcd269c130bb4d76b4b20d4d56ff7
2018-08-13 09:45:17 -07:00
Tao Bao
96e8544a52
Merge "Build recovery with Soong." am: df264e0186 am: 24b16491db
...
am: 287ce6ebea
Change-Id: Idab5e805d896b9595e8fbbe12213b85fb80c2ae1
2018-08-13 09:41:15 -07:00
Tao Bao
287ce6ebea
Merge "Build recovery with Soong." am: df264e0186
...
am: 24b16491db
Change-Id: I5708d582aa745e398a165e589ad3df192d1b6c84
2018-08-13 09:36:21 -07:00
Tao Bao
24b16491db
Merge "Build recovery with Soong."
...
am: df264e0186
Change-Id: Ibb7075be2286f4df99667ef1ace22a58b9bec7df
2018-08-13 09:32:31 -07:00
Tao Bao
df264e0186
Merge "Build recovery with Soong."
2018-08-13 16:25:48 +00:00
Tao Bao
637de2d564
Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014f am: 9c2145d297
...
am: da7bf54cd8
Change-Id: I6a964a5f3d1dcac23b456f38abb58a404ec29648
2018-08-13 08:55:01 -07:00
Tao Bao
da7bf54cd8
Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165 am: e5734c014f
...
am: 9c2145d297
Change-Id: I584a1377a809bf730773e824f818fedb9fb75aa5
2018-08-13 08:51:05 -07:00
Tao Bao
9c2145d297
Merge "tests: Create res-testdata for testdata pickup." am: 2cc6211165
...
am: e5734c014f
Change-Id: Ia13c3f4b0940f2089f747d6cf23cc691889f0b25
2018-08-13 08:47:11 -07:00
Tao Bao
e5734c014f
Merge "tests: Create res-testdata for testdata pickup."
...
am: 2cc6211165
Change-Id: Ife7e354f91f07f715e012a37d65fe264c4d0e44d
2018-08-13 08:43:17 -07:00
Tao Bao
2cc6211165
Merge "tests: Create res-testdata for testdata pickup."
2018-08-13 15:35:09 +00:00
Tao Bao
13f9816e14
tests: Create res-testdata for testdata pickup.
...
It doesn't change the functionality of the test, but allows easier
conversion to Soong.
Test: Run recovery_component_test on marlin.
Change-Id: Ic7419dc86c6b220531ae44e49ab4657394a5d7fa
2018-08-12 21:57:08 -07:00
Hridya Valsaraju
eee4b3a61b
Merge "Build boot control HAL with Android.bp" am: bbe881693a am: b5e9049476 am: 1303267b32
...
am: 360fbb16b7
Change-Id: I8696a5fb17f40880d2a4c3660e24320c5004cf2f
2018-08-10 18:37:12 -07:00
Hridya Valsaraju
360fbb16b7
Merge "Build boot control HAL with Android.bp" am: bbe881693a am: b5e9049476
...
am: 1303267b32
Change-Id: Ib7b238164d0e2adc144f57b246d07d95ce9bbd1b
2018-08-10 17:56:09 -07:00
Hridya Valsaraju
1303267b32
Merge "Build boot control HAL with Android.bp" am: bbe881693a
...
am: b5e9049476
Change-Id: I8bed367854e978cabb970dd77801158954e12cc3
2018-08-10 17:26:35 -07:00
Hridya Valsaraju
b5e9049476
Merge "Build boot control HAL with Android.bp"
...
am: bbe881693a
Change-Id: Idbd45cd24b99ae92f1dd50b4e6011c87d62d9419
2018-08-10 17:08:19 -07:00
Treehugger Robot
bbe881693a
Merge "Build boot control HAL with Android.bp"
2018-08-10 22:48:19 +00:00
Tao Bao
5fc72a103b
Build recovery with Soong.
...
Fixes: 110380063
Test: `mmma -j bootable/recovery` with aosp_taimen-userdebug
Test: Build and boot into recovery on taimen. Check the basic
functionalities (`Apply update from ADB`, `View recovery logs`,
`Run graphics test`).
Test: Run recovery_unit_test and recovery_component_test on marlin.
Test: Modify `recovery.cpp` locally to trigger the call to
is_battery_ok(). Check that the battery info is reported
correctly.
Test: `build/soong/build_test.bash --dist`
Change-Id: I391eb201d57c760e457ba2bf2410ceb72596795c
2018-08-10 14:43:27 -07:00
Tao Bao
c21ed553e5
Merge "updater_sample: Move to Soong." am: afa16480aa am: e98bdd979c am: ab3a4688b1
...
am: c8426c1f6a
Change-Id: I4a3e5da53c484f17697179fe47dec4be330d425a
2018-08-10 14:04:25 -07:00
Tao Bao
4a05e5ebdf
Merge "recovery uses more shared libraries." am: 3c5e2c1c7e am: f8f53fd04c am: 14acf82585
...
am: 8ff5570ae5
Change-Id: Icf638b95ae67a9a1d69790232e60d789575818f8
2018-08-10 14:04:01 -07:00
Tao Bao
c8426c1f6a
Merge "updater_sample: Move to Soong." am: afa16480aa am: e98bdd979c
...
am: ab3a4688b1
Change-Id: Ic3e8f9485d5f9ee0ba0a575f6d72bd03544443de
2018-08-10 13:13:02 -07:00
Tao Bao
8ff5570ae5
Merge "recovery uses more shared libraries." am: 3c5e2c1c7e am: f8f53fd04c
...
am: 14acf82585
Change-Id: I54b15a9cc81524612f11554385ec2e6db93ff2a6
2018-08-10 13:12:34 -07:00
Tao Bao
ab3a4688b1
Merge "updater_sample: Move to Soong." am: afa16480aa
...
am: e98bdd979c
Change-Id: I10ba70e73bea53fa9a7d9408be5f02da7a85d488
2018-08-10 12:36:04 -07:00
Tao Bao
14acf82585
Merge "recovery uses more shared libraries." am: 3c5e2c1c7e
...
am: f8f53fd04c
Change-Id: Ibf374ac95558eecf13e7aeca8f86b4f285e806e0
2018-08-10 12:35:46 -07:00
Tao Bao
e98bdd979c
Merge "updater_sample: Move to Soong."
...
am: afa16480aa
Change-Id: Id8ba9ceacf6c449114759a9b0c92e78ab718a129
2018-08-10 12:07:44 -07:00
Tao Bao
f8f53fd04c
Merge "recovery uses more shared libraries."
...
am: 3c5e2c1c7e
Change-Id: If4070036031ba754c2686ff6dc6d52f7cebd4044
2018-08-10 12:07:26 -07:00
Tao Bao
afa16480aa
Merge "updater_sample: Move to Soong."
2018-08-10 18:10:31 +00:00
Tao Bao
3c5e2c1c7e
Merge "recovery uses more shared libraries."
2018-08-10 18:10:16 +00:00
Tao Bao
d2be7fc29a
updater_sample: Move to Soong.
...
Test: Follow the steps in "Running tests" in updater_sample/README.md.
Change-Id: I70c3239e3daea0dcdadf02f68abe7d6aafa67a2e
2018-08-10 09:05:56 -07:00
Hridya Valsaraju
c53dad20d0
Build boot control HAL with Android.bp
...
Bug: 78793464
Test: make
Change-Id: Id5efceda0f5e93bbaf33c2dc3e203fd39ef44e28
2018-08-09 22:15:01 -07:00
Tao Bao
818f938188
recovery uses more shared libraries.
...
Bug: 110380063
Test: `m -j installclean && mmma -j bootable/recovery` with
aosp_taimen-userdebug
Test: Build (`m -j bootimage`) and boot into recovery. Check that
`adb sideload` and `Run graphics test` both work.
Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: Ie6ed0e7cafa352d5faff9d1b6ccef724a0415e65
2018-08-08 14:26:27 -07:00
Tao Bao
d7859b1cb0
Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5e am: 60fafd50d3
...
am: a277a1d2af
Change-Id: If8c2e304ce2a959c5f5373276bc169b9d8603560
2018-08-08 12:04:19 -07:00
Tao Bao
7fc3e956ba
Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284 am: 2217000e87
...
am: cae4f26149
Change-Id: I2ce0e4a2212d317223489e3bb2d7dd80de9b8ac4
2018-08-08 11:59:01 -07:00
Tao Bao
a277a1d2af
Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f am: 60e218cb5e
...
am: 60fafd50d3
Change-Id: I9d952b640128d4ea48bf1b11322e352268428e0a
2018-08-08 11:48:05 -07:00
Tao Bao
60fafd50d3
Merge "Revert "Build and use minadbd as a shared library."" am: 08cf9ccb2f
...
am: 60e218cb5e
Change-Id: Icd65d8a26f5e619f3ce08727ca673cc4a65a0570
2018-08-08 11:35:06 -07:00
Tao Bao
cae4f26149
Merge "minui: Track libsync module name change." am: 60924fa89a am: 7c42dc7284
...
am: 2217000e87
Change-Id: If0aca6d0e9e1dc73d899510951475ba3e489f51d
2018-08-08 11:34:51 -07:00
Tao Bao
6b8c78db1e
Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6 am: d6a445c1b5
...
am: 53bca233b1
Change-Id: Ideb0925b09621a8d68c117a881863c281381c9f5
2018-08-08 11:32:56 -07:00
Tao Bao
2217000e87
Merge "minui: Track libsync module name change." am: 60924fa89a
...
am: 7c42dc7284
Change-Id: Ied9da9412ab84395990f0978806d7285530ad06f
2018-08-08 11:18:34 -07:00
Tao Bao
60e218cb5e
Merge "Revert "Build and use minadbd as a shared library.""
...
am: 08cf9ccb2f
Change-Id: I5fd181c84e7c968032087f6d1e570cba818e6f11
2018-08-08 11:14:50 -07:00
Tao Bao
53bca233b1
Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477 am: e0ded949e6
...
am: d6a445c1b5
Change-Id: I5f5e27daddd642fbff036d701e90bf900d8e3c41
2018-08-08 11:06:30 -07:00
Tao Bao
7c42dc7284
Merge "minui: Track libsync module name change."
...
am: 60924fa89a
Change-Id: Iaa05687f2288ef48a5b9e4ea8e3a7bbea7b00ec2
2018-08-08 11:02:53 -07:00