PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,680 Commits 1 Branch 0 Tags
d7859b1cb0d18b5c8ea44e4168177a06545409ab
Commit Graph

6680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Tao Bao 08cf9ccb2f Merge "Revert "Build and use minadbd as a shared library."" 2018-08-08 16:36:20 +00: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
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 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 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
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