PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,977 Commits 1 Branch 0 Tags
0b2be22f01ee0ebbf805725f334e8ed2168af5e8
Commit Graph
2977 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xuandandroid-build-merger 0b2be22f01 Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 
am: 91f736fe1a

Change-Id: I43824dc487e506423d3b54638665bd51edf870ed
 2016-11-12 01:17:03 +00:00
Tianjie Xuandandroid-build-merger 91f736fe1a Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 
am: f2574b8206

Change-Id: I81b174662c620a4af2f7992f37ffd402e92657e7
 2016-11-12 01:09:34 +00:00
Tianjie Xuandandroid-build-merger f2574b8206 Merge "Allow uncrypt to work without socket communication" 
am: 4c1f3eda98

Change-Id: I8e86d4201d2fac0293e70df54e0816c96e85a9b7
 2016-11-12 01:02:33 +00:00
Tianjie XuandGerrit Code Review 4c1f3eda98 Merge "Allow uncrypt to work without socket communication" 2016-11-12 00:49:16 +00:00
Tianjie Xu 7ceff3e003 Allow uncrypt to work without socket communication 
It was inconvenient to uncrypt a update package under adb shell
because the uncrypt executable required a socket to start its job.
Add a workaround to allow uncrypt executes without socket
communication.

Test: run uncrypt under adb shell, and the block map generates successfully
Bug: 29906218

Change-Id: Ibc328b31636d925dc429ede8dcec7392a721dd53
(cherry picked from commit 28c1e5d3aa)
 2016-11-11 13:51:15 -08:00
Vineela Tummalapalliandandroid-build-merger 9128e5f85a Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 am: 118e814bfe 
am: 62aaba5a3f

Change-Id: Iff0eca5ba1522c3e51afc439d8008c7ad781b871
 2016-11-10 03:04:19 +00:00
Vineela Tummalapalliandandroid-build-merger 62aaba5a3f Merge "Add 'reboot bootloader' to bootloader_message." am: a5538b87e8 
am: 118e814bfe

Change-Id: I2b57d683afce0cb40925187f8a4369a300129a8c
 2016-11-10 02:58:17 +00:00
Vineela Tummalapalliandandroid-build-merger 118e814bfe Merge "Add 'reboot bootloader' to bootloader_message." 
am: a5538b87e8

Change-Id: I432f48453d2627e165fda7cda1945157ff0e83ae
 2016-11-10 02:52:18 +00:00
Treehugger RobotandGerrit Code Review a5538b87e8 Merge "Add 'reboot bootloader' to bootloader_message." 2016-11-10 02:43:08 +00:00
Vineela TummalapalliandAlex Deymo cba7fa88d8 Add 'reboot bootloader' to bootloader_message. 
Add 'reboot bootloader' capability to the bootloader_message.

BUG: https://issuetracker.google.com/issues/32474515

Change-Id: I01e8b2fad978bf7c8fc96ff6b08ad3e52533f504
Author: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Vineela Tummalapalli <vineela.tummalapalli@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Reviewed-on: https://android.intel.com/548519
 2016-11-09 17:24:57 -08:00
Tianjie Xuandandroid-build-merger e10ff54e90 Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours am: 96c3c32b66 
am: b86af2577c

Change-Id: I21b7f6df6facfcdb547e2aef3d4d8e19492c8e2d
 2016-11-10 00:23:07 +00:00
Tianjie Xuandandroid-build-merger b86af2577c Merge "Touch blocks in care_map in update_verifier" am: 3605a072bc -s ours 
am: 96c3c32b66

Change-Id: I94c50d0c24b1d0d2331b1c5fd117c06542c85533
 2016-11-10 00:17:07 +00:00
Tianjie Xuandandroid-build-merger 96c3c32b66 Merge "Touch blocks in care_map in update_verifier" 
am: 3605a072bc  -s ours

Change-Id: Ie19a8ebf3f575599a5ed9ddcd80ab99e06f6cf77
 2016-11-10 00:11:40 +00:00
Tianjie XuandGerrit Code Review 3605a072bc Merge "Touch blocks in care_map in update_verifier" 2016-11-09 23:52:52 +00:00
Tianjie Xu d007cf2da2 Touch blocks in care_map in update_verifier 
Read all blocks in system and vendor partition during boot time
so that dm-verity could verify this partition is properly flashed.

Bug: 27175949
Change-Id: I38ff7b18ee4f2733e639b89633d36f5ed551c989
Test: mma
(cherry picked from commit 03ca853a1c)
(cherry picked from commit 4bbe0c93c8)
(Fix a typo when comparing the verity mode)
(cherry picked from commit da654af606)
(Skip update verification if care_map is not found)
 2016-11-09 20:10:27 +00:00
Tao Baoandandroid-build-merger 7e62f22d78 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 am: 2c175c302c 
am: 7da0c7e439

Change-Id: I2e106e5f804be4e7f69d2642cb88249ec0bffaca
 2016-11-09 19:25:14 +00:00
Tao Baoandandroid-build-merger 7da0c7e439 Merge "updater: Add more testcase for symlink()." am: 1b74e8cea8 
am: 2c175c302c

Change-Id: I0e739c4585088ac2b88809924c16ea1bf18e8794
 2016-11-09 19:20:45 +00:00
Tao Baoandandroid-build-merger 2c175c302c Merge "updater: Add more testcase for symlink()." 
am: 1b74e8cea8

Change-Id: I67f19e5992d755f08109ccad4feed2ac3f9dffde
 2016-11-09 19:13:43 +00:00
Tao BaoandGerrit Code Review 1b74e8cea8 Merge "updater: Add more testcase for symlink()." 2016-11-09 19:05:01 +00:00
Tao Baoandandroid-build-merger 4917a8cf62 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 
am: d9d435cd83

Change-Id: I5b1882758ae438cc6dd6a4926d20a04ece594032
 2016-11-09 05:51:21 +00:00
Tao Baoandandroid-build-merger d9d435cd83 Merge "otautil: Clean up obsolete includes." am: b80d136dca 
am: b50fa1fc23

Change-Id: I297e91af6b5cdcf9bec524764e5dbe6a879fd4a7
 2016-11-09 05:45:50 +00:00
Tao Baoandandroid-build-merger b50fa1fc23 Merge "otautil: Clean up obsolete includes." 
am: b80d136dca

Change-Id: I374d678fe6636284d6ab9238418266fac355e14e
 2016-11-09 05:39:20 +00:00
Tao BaoandGerrit Code Review b80d136dca Merge "otautil: Clean up obsolete includes." 2016-11-09 05:32:06 +00:00
Tao Bao 8992902aab updater: Add more testcase for symlink(). 
Clean up SymlinkFn() a bit. Also clean up the temp files created when
running the tests; otherwise non-empty TemporaryDir won't be removed.

Test: recovery_component_test passes.
Change-Id: Id3844abebd168c40125c4dcec54e6ef680a83c3a
 2016-11-08 21:29:16 -08:00
Tao Bao 14b61e7b96 otautil: Clean up obsolete includes. 
external/zlib and external/safe-iop/include were used by Zip.c, which
became obsolete after [1].

Removing
 - <assert.h>: we no longer call assert(3);
 - <limits.h>: we no longer use PATH_MAX;
 - <stdio.h>: we don't need FILE anymore;
 - <stdlib.h>: no more malloc(3)/calloc(3);
 - <unistd.h>: was once needed for lseek(2);
 - <string.h>: no more memset(3).

Adding
 - <stdint.h> for SIZE_MAX.

[1] commit 8cf5c8f60f: "Replace minzip
with libziparchive".

Test: `mmma bootable/recovery`
Change-Id: I349e909ba83d0f6ade5f92856ce3934f29fdca6c
 2016-11-08 13:39:12 -08:00
Tianjie Xuandandroid-build-merger cd3513c8dd Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 
am: 260573b3c2

Change-Id: Icc898211217bf9ecfcefba02ecc96be17b636579
 2016-11-08 21:08:23 +00:00
Tianjie Xuandandroid-build-merger e04fd5375c Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 am: e9390679c9 
am: a1c121e034

Change-Id: I42cc7e9246516b7f6f9feff6f58187cee3b4b89e
 2016-11-08 21:08:12 +00:00
Tianjie Xuandandroid-build-merger 260573b3c2 Merge "Make make_parent() to take const argument" am: 52e2a97aa7 
am: 1fd9f0aff7

Change-Id: I5ce1d09108c90e3a800942653777c374a302449a
 2016-11-08 21:03:25 +00:00
Tianjie Xuandandroid-build-merger a1c121e034 Merge "Move recovery_test.cpp out of unit test" am: 8bfd96c0f8 
am: e9390679c9

Change-Id: Ie5be9db1d0d01f90181dba071df69e24f802c29d
 2016-11-08 21:03:12 +00:00
Tianjie Xuandandroid-build-merger 1fd9f0aff7 Merge "Make make_parent() to take const argument" 
am: 52e2a97aa7

Change-Id: Ia4d597510cf99ade837a9c6a33b19788b8cf2291
 2016-11-08 20:57:54 +00:00
Tianjie Xuandandroid-build-merger e9390679c9 Merge "Move recovery_test.cpp out of unit test" 
am: 8bfd96c0f8

Change-Id: I34ecca789d64dda77bec85d577ff0b7320a2b128
 2016-11-08 20:57:42 +00:00
Treehugger RobotandGerrit Code Review 52e2a97aa7 Merge "Make make_parent() to take const argument" 2016-11-08 20:53:59 +00:00
Treehugger RobotandGerrit Code Review 8bfd96c0f8 Merge "Move recovery_test.cpp out of unit test" 2016-11-08 20:48:20 +00:00
Tao Baoandandroid-build-merger 5fee534a8a resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d 
am: 5d52303488

Change-Id: I15771163a003a498dbe7d9731f90e29171b97d7d
 2016-11-08 19:53:07 +00:00
Tao Baoandandroid-build-merger 5d52303488 resolve merge conflicts of 70172d7 to stage-aosp-master 
am: 55883f660d

Change-Id: I5946acb7c1c83061ae84b16d6b94ff502007d981
 2016-11-08 19:48:07 +00:00
Tao Bao 55883f660d resolve merge conflicts of 70172d7 to stage-aosp-master 
Change-Id: I7626b57f9c8fd722708862ff1ae09c4fc0def51c
 2016-11-08 10:49:47 -08:00
Tianjie Xu 5d8b53b248 Move recovery_test.cpp out of unit test 
Move recovery-refresh/persist tests out because these tests need special
steps to run. Also switch the constants to std::string.

Test: recovery_manual_test passed on an A/B device
Change-Id: I60b3ec6f094044945c3aafc1fae540896a6ddea6
 2016-11-08 10:42:51 -08:00
Tao BaoandGerrit Code Review 70172d76ef Merge "otautil: Clean up SysUtil.cpp." 2016-11-08 18:29:37 +00:00
Tianjie Xu d75003d24c Make make_parent() to take const argument 
Switch to use const std::string; and add corresponding tests.

Bug: 32649858
Test: Component tests pass
Change-Id: I640f3ec81f1481fa91aa310f8d4d96dac9649cb9
 2016-11-08 10:11:03 -08:00
Tao Bao c3292f3fcb otautil: Clean up SysUtil.cpp. 
Add unit testcases for sysMapFile().

Test: recovery_unit_test passes.
Test: Build and use the new recovery image to sideload a package.
Test: Build and use the new recovery image to install an update.

Change-Id: I77d8f1ea151ab513865d992c256ba93a1fcb51a4
 2016-11-07 13:00:38 -08:00
Tao Baoandandroid-build-merger d447124c00 Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 
am: a99c6eab22

Change-Id: Ib4204eb664a918f333f1603dd3789d9ef0478a60
 2016-11-07 19:25:07 +00:00
Tao Baoandandroid-build-merger a99c6eab22 Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 
am: f46041a7d4

Change-Id: Ib53eeab18ca2f3e2c1032846e99c96c4f0fd5017
 2016-11-07 19:20:07 +00:00
Tao Baoandandroid-build-merger f46041a7d4 Merge "tests: Fix unit/zip_test.cpp." 
am: ba41fba9e4

Change-Id: Ie756b132205a3602cdec4062fc84a725b9086479
 2016-11-07 19:14:36 +00:00
Tao BaoandGerrit Code Review ba41fba9e4 Merge "tests: Fix unit/zip_test.cpp." 2016-11-07 19:07:44 +00:00
Tao Bao 0dfb7536bb tests: Fix unit/zip_test.cpp. 
It's accidentally broken when refactoring the testdata path. Also clean
up the testcase a bit by simplying the file reading.

Test: recovery_unit_test passes.

Change-Id: I592a1cf5a4eb9a7a5f4eecbc6426baeedeb02781
 2016-11-04 15:20:52 -07:00
Tao Baoandandroid-build-merger 63ae92ded4 Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e 
am: 8269eb0d1f

Change-Id: I6d8211ab3825c34e8945a249fb2151a01a3ac371
 2016-11-04 21:11:41 +00:00
Tao Baoandandroid-build-merger 8269eb0d1f Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df 
am: 05a801ca8e

Change-Id: Ib6e162dd08ecb4f97a06beb54c26c5348a6782d1
 2016-11-04 21:07:42 +00:00
Tao Baoandandroid-build-merger 05a801ca8e Merge "updater: Add a testcase for RenameFn()." 
am: d0daf7f7df

Change-Id: I606b95f3d164063a271cd8faac8c5bfe42e2ef60
 2016-11-04 21:04:12 +00:00
Tao BaoandGerrit Code Review d0daf7f7df Merge "updater: Add a testcase for RenameFn()." 2016-11-04 21:01:11 +00:00
Tianjie Xuandandroid-build-merger 7770c6f93e Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 
am: 92097726ef

Change-Id: I714039a80d738392c6c1d967ae4e17c0fadce8bd
 2016-11-04 18:21:01 +00:00