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
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
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
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
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
Tao Bao
d6a445c1b5
Merge "Fix the DRM_FORMAT match with corresponding PixelFormat" am: 1e4f9c0477
...
am: e0ded949e6
Change-Id: I24c5dba3f0f22a92279a61cacd1162b8256b22ef
2018-08-08 10:58:20 -07:00
Tao Bao
e0ded949e6
Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"
...
am: 1e4f9c0477
Change-Id: I6e373814b25c0b2baef633b5c915d8a11e5037fa
2018-08-08 10:50:41 -07:00
Tao Bao
42e2801937
Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9e
...
am: 4bdb7b3c33
Change-Id: Ia7bab18c65055cafed6144ff26188fde74cffcd0
2018-08-08 10:34:03 -07:00
Tao Bao
4bdb7b3c33
Merge "Build and use minadbd as a shared library." am: ea38c4160a
...
am: 479dd68d9e
Change-Id: I44428a33c4dd05760f7f763b7813eb924a1bbcc7
2018-08-08 10:27:09 -07:00
Tao Bao
479dd68d9e
Merge "Build and use minadbd as a shared library."
...
am: ea38c4160a
Change-Id: I5483268632a83ad7ef048e02bede68c8d9ac0dbb
2018-08-08 10:22:14 -07:00
Tao Bao
08cf9ccb2f
Merge "Revert "Build and use minadbd as a shared library.""
2018-08-08 16:36:20 +00:00
Tao Bao
c70446ce7b
Revert "Build and use minadbd as a shared library."
...
This reverts commit 4fd4f89591 .
The reverted CL has a side effect that unintentionally installs
a copy of libminadbd_services.so to the system image. This breaks the
check with `build/soong/build_test.bash --dist` which detects and
prevents vendor modules from installing files to the system image.
Prior to fully converting `recovery` to be built with Soong, we have to
statically link recovery-specific modules into `recovery`.
Bug: 110380063
Test: `m -j bootimage` with aosp_marlin-userdebug
Test: Run minadbd_test on marlin.
Test: Boot into recovery and verify that sideloading still works.
Test: `build/soong/build_test.bash --dist`
Change-Id: I290d55c82e17aa60a5afdf2ff7f896afc4dae8b3
2018-08-07 20:44:39 -07:00
Xin Li
4c25f23747
Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108
...
am: 1f642fcc6a
Change-Id: I50bd3a35979569c03a149416bd99617fca06d99f
2018-08-07 20:33:54 -07:00
Tao Bao
60924fa89a
Merge "minui: Track libsync module name change."
2018-08-08 00:26:38 +00:00
Xin Li
1f642fcc6a
Merge "Merge Android Pie into master" am: 9791b21c1f
...
am: 555802b108
Change-Id: Iad6285b0063f3b254146c2110a7f93118c391e05
2018-08-07 16:56:01 -07:00
Xin Li
555802b108
Merge "Merge Android Pie into master"
...
am: 9791b21c1f
Change-Id: Ic7faf2fe40859909980c26afb4534d23ac7cd3f9
2018-08-07 13:17:43 -07:00
Tao Bao
1e4f9c0477
Merge "Fix the DRM_FORMAT match with corresponding PixelFormat"
2018-08-07 19:49:14 +00:00
Tom Cherry
deb77d3310
Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3
...
am: 9001c159b3
Change-Id: I13f674f9467fa92e1e9ea24ec9b7787cefc41a19
2018-08-07 11:18:07 -07:00
Tom Cherry
9001c159b3
Merge "ueventd is now at /system/bin/ueventd" am: aceb244401
...
am: 89048728f3
Change-Id: I72c7db988d81cda296e640cfcdcd63fc70bfb3a1
2018-08-07 11:05:28 -07:00
Tao Bao
1c4d4bf4f4
minui: Track libsync module name change.
...
Needs the matching change to libsync_recovery.
Test: `mmma -j bootable/recovery`
Change-Id: I69b5c978e9b4d16957ffecd360796b29cd95865c
2018-08-07 11:04:27 -07:00
Tao Bao
ea38c4160a
Merge "Build and use minadbd as a shared library."
2018-08-07 17:50:45 +00:00
tangrobin
13bec76662
Fix the DRM_FORMAT match with corresponding PixelFormat
...
The DRM_FORMAT settings in DrmCreateSurface should match with the
correct PixelFormat
Bug: 112245291
Test: build and flash boot image to device.
Change-Id: I3ee0de38256d1109cd5174b666e2f47dceb637e6
2018-08-07 10:10:33 -07:00
Xin Li
9791b21c1f
Merge "Merge Android Pie into master"
2018-08-07 16:51:25 +00:00
Tom Cherry
89048728f3
Merge "ueventd is now at /system/bin/ueventd"
...
am: aceb244401
Change-Id: I49aec85c5e32d1b8a3d982b875d188d162694d26
2018-08-07 09:42:59 -07:00
Tom Cherry
aceb244401
Merge "ueventd is now at /system/bin/ueventd"
2018-08-07 16:08:55 +00:00
Tao Bao
4fd4f89591
Build and use minadbd as a shared library.
...
The former `minadbd` module is now built as a shared library
(`libminadbd_services.so`) that serves sideloading under recovery, with
a dynamic dependency on `libadbd.so`.
This allows sharing and reusing libadbd code on device (both of `adbd`
and `recovery` now uses `libadbd.so`). As a result, it reduces the size
of `recovery` binary from 1407360-byte to (1272880 + 33032)-byte
(aosp_marlin-userdebug).
Bug: 78793464
Test: `m -j bootimage` with aosp_marlin-userdebug
Test: Run minadbd_test on marlin.
Test: Boot into recovery and verify that sideloading still works.
Change-Id: I6c2bc3d351d5af71220a9b9f956c8c039e52c781
2018-08-06 17:06:43 -07:00
Xin Li
8ab68527b8
Merge Android Pie into master
...
Bug: 112104996
Change-Id: I3256ec97f091b367c5a2c0b31430a975073a2c1b
2018-08-06 16:50:00 -07:00
Tianjie Xu
eb316575d6
Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432
...
am: f82ff97029
Change-Id: I5ccf2e886af1076f0af97b36dc87fbf73501e744
2018-08-06 16:23:14 -07:00