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
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
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
c31067b02c
Merge "Build and use minadbd as a shared library." am: ea38c4160a am: 479dd68d9e am: 4bdb7b3c33
...
am: 42e2801937
Change-Id: Idb062fed25928397ec4bddd1018e6bb95d4311ad
2018-08-08 10:40:21 -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
Xin Li
580566f4fa
Merge "Merge Android Pie into master" am: 9791b21c1f am: 555802b108 am: 1f642fcc6a
...
am: 4c25f23747
Change-Id: Ief55bba1eac53296a804ff8c0c4e4df5970839fb
2018-08-08 01:03:49 -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
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
f2c45419d6
Merge "ueventd is now at /system/bin/ueventd" am: aceb244401 am: 89048728f3 am: 9001c159b3
...
am: deb77d3310
Change-Id: Ib1504085cb9f9bfd06fdddb410c27a560adc4128
2018-08-07 11:43:10 -07: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
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
Tianjie Xu
9b15aac2fa
Merge "Add an updater function to compute hash tree" am: dbe4420325 am: b5bc978432 am: f82ff97029
...
am: eb316575d6
Change-Id: I644941d43f4c84ed7c7665a9f219c4f5d3d2f0b3
2018-08-06 21:06:19 -07:00
Tao Bao
6e1b0c3310
Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207 am: 39259af890
...
am: 50bb0bcfd0
Change-Id: Ib83124c79bdcfa3a79c830e074e883733eaf9c79
2018-08-06 20:56:27 -07: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
Tianjie Xu
f82ff97029
Merge "Add an updater function to compute hash tree" am: dbe4420325
...
am: b5bc978432
Change-Id: Ie876da6cd0c875431124d09619c2c04d71900d4d
2018-08-06 16:04:15 -07:00
Tao Bao
50bb0bcfd0
Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9 am: 75acf24207
...
am: 39259af890
Change-Id: I44e057b36e1bb3fa53059736f0f9e2fcbfc014a4
2018-08-06 16:00:06 -07:00
Tao Bao
39259af890
Merge "Dynamically load device-specific recovery UI lib." am: 9cf9b689d9
...
am: 75acf24207
Change-Id: I9a836dc442058856ab4dc71ccccc96029d3194cf
2018-08-06 15:45:52 -07:00
Tianjie Xu
b5bc978432
Merge "Add an updater function to compute hash tree"
...
am: dbe4420325
Change-Id: If426801d3494be02404c8e4f6d4f064fd6540a4d
2018-08-06 15:36:55 -07:00
Tao Bao
75acf24207
Merge "Dynamically load device-specific recovery UI lib."
...
am: 9cf9b689d9
Change-Id: I73e3fdc01ff4b51fd18272980ce1360b0bc069f7
2018-08-06 15:32:57 -07:00
Tianjie Xu
dbe4420325
Merge "Add an updater function to compute hash tree"
2018-08-06 22:19:04 +00:00
Tao Bao
9cf9b689d9
Merge "Dynamically load device-specific recovery UI lib."
2018-08-06 21:46:10 +00:00
Tao Bao
42c45e2b66
Dynamically load device-specific recovery UI lib.
...
We used to statically link the device-specific recovery UI extension
(`TARGET_RECOVERY_UI_LIB`) into `recovery`. Such a logic can't be easily
migrated to Soong, as modules specified by `TARGET_RECOVERY_UI_LIB` may
not be built with Soong.
Instead of porting all the device-specific codes over, this CL builds
and installs the UI lib as a shared library with Android.mk. `recovery`
dlopen(3)'s and dlsym(3)'s `make_device` to invoke the device-specific
UI lib on start.
Note that in order to make dlopen(3) actually working, we have to switch
`recovery` to be dynamically linked (we will make the move later
anyway).
Bug: 110380063
Test: Build and boot into marlin recovery image. Check that
device-specific recovery UI is successfully loaded.
Change-Id: Ia9861c7559a95f3f50676534540c0cb87cae4574
2018-08-06 12:35:23 -07:00
Tianjie Xu
69ffa15338
Add an updater function to compute hash tree
...
The new command is part of the transfer.list and allows us to compute the hash
tree on non-ab devices.
The required arguments for the hash_tree computation are:
hash_tree_ranges
source_ranges
hash_algorithm
salt_hex
root_hash
Bug: 25170618
Test: unit tests pass; run simulator with compute_hash_tree
Change-Id: I8ff0d582cc8adabb8a060db7845f38b35b28e62c
2018-08-06 12:17:50 -07:00
Tao Bao
a5a12d5a4f
Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5 am: bf40c42766
...
am: 151fbba314
Change-Id: Ic671d306f38e89955941b53f770da234622a4936
2018-08-06 11:26:18 -07:00
Tao Bao
151fbba314
Merge "minui: Move to Soong." am: f2bc68cfe1 am: ea105889a5
...
am: bf40c42766
Change-Id: Ibdb66b0d0f5a5be54dcf6fd9f9797439292af406
2018-08-06 11:12:20 -07:00
Tao Bao
bf40c42766
Merge "minui: Move to Soong." am: f2bc68cfe1
...
am: ea105889a5
Change-Id: Iee4d709563685c7a79aed0e4b9887805c413fb32
2018-08-06 11:08:10 -07:00
Tao Bao
ea105889a5
Merge "minui: Move to Soong."
...
am: f2bc68cfe1
Change-Id: Iab9a892a3d4d691884e4709c288de1d122d67473
2018-08-06 10:58:16 -07:00
Tao Bao
f2bc68cfe1
Merge "minui: Move to Soong."
2018-08-06 17:29:50 +00:00
Tao Bao
7ee83f627e
minui: Move to Soong.
...
Note that although libminui says "shared_libs" in Android.bp file,
`recovery` binary will still statically link the libs, until we drop the
`LOCAL_FORCE_STATIC_EXECUTABLE := true` flag from `recovery` module.
Bug: 110380063
Test: `mmma -j bootable/recovery` with aosp_taimen-userdebug
Test: Boot into recovery and `Run graphics test`.
Change-Id: I48785d161dfe52eb01667e938d9c3f0a497b61a2
2018-08-05 14:42:26 -07:00
Tao Bao
18834739eb
Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560 am: 8f545f4c8c
...
am: f0e0fff6ea
Change-Id: If440cae460cb8c13e9c30905f146e27d9f5fe38b
2018-08-03 17:11:48 -07:00
Tao Bao
06fcb36167
Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518 am: 814468deb5
...
am: 00c9829f4a
Change-Id: I7e5c4e93c01919913efc9d73608c5a4df703163f
2018-08-03 17:11:37 -07:00
Tao Bao
f0e0fff6ea
Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a am: ce0409a560
...
am: 8f545f4c8c
Change-Id: I152c9afe31255d5329475fffd19e48a4f17dc792
2018-08-03 16:56:41 -07:00
Tao Bao
00c9829f4a
Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07 am: 17bf8d0518
...
am: 814468deb5
Change-Id: I6f3120621d06cabf123ec5052cb7ace0f6cb6dde
2018-08-03 16:56:30 -07:00
Tao Bao
8f545f4c8c
Merge "minui: Use runtime properties instead of build time vars." am: ebc04d1e7a
...
am: ce0409a560
Change-Id: Icf0f15841560ece076c33fbc15425d800d656441
2018-08-03 16:28:19 -07:00
Tao Bao
814468deb5
Merge "ui: Read custom recovery UI values via system property." am: 2117b4bd07
...
am: 17bf8d0518
Change-Id: I2e40e9e62be581fc5fdf3479b851c259909b0184
2018-08-03 16:28:11 -07:00
Tao Bao
ce0409a560
Merge "minui: Use runtime properties instead of build time vars."
...
am: ebc04d1e7a
Change-Id: Ied0cc8732e0c5d75d1608c4aaa637c04548ecfe6
2018-08-03 16:02:25 -07:00
Tao Bao
17bf8d0518
Merge "ui: Read custom recovery UI values via system property."
...
am: 2117b4bd07
Change-Id: Ia9e2d805f2e90b9be8426010581a32d0b27fe8e6
2018-08-03 16:02:17 -07:00
Tao Bao
ebc04d1e7a
Merge "minui: Use runtime properties instead of build time vars."
2018-08-03 21:51:20 +00:00