PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,296 Commits 1 Branch 0 Tags
44f6b182dd5c3eb2d541c9386dee94de5677bbec
Commit Graph
7296 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 9003067b31 Merge "otautil: Clean up obsolete includes." am: b80d136dca am: b50fa1fc23 am: d9d435cd83 
am: 4917a8cf62

Change-Id: Ieb092da172224dc669191943886957adc87dfd65
 2016-11-09 05:56:51 +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 BaoandAndroid (Google) Code Review ae373889d0 Merge "otautil: Clean up obsolete includes." 2016-11-09 04:34:28 +00:00
Rahul Chaudhry 4f7faac8d7 Use static_cast to cast pointers returned by malloc/calloc/realloc/mmap. 
static_cast is preferable to reinterpret_cast when casting from void*
pointers returned by malloc/calloc/realloc/mmap calls.

Discovered while looking at compiler warnings (b/26936282).

Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mma
Change-Id: I151642d5a60c94f312d0611576ad0143c249ba3d
 2016-11-08 16:34:01 -08:00
Sandeep PatilandAndroid (Google) Code Review 4ded613170 Merge "healthd: change how charger is launched in recovery." 2016-11-08 23:45:17 +00:00
Tao Bao 3c38f5623f 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
(cherry picked from commit 14b61e7b96)
 2016-11-08 14:46:43 -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 b66b94c56c Merge "Make make_parent() to take const argument" am: 52e2a97aa7 am: 1fd9f0aff7 am: 260573b3c2 
am: cd3513c8dd

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

Change-Id: I0592b6ca98fd7ca598139165b198314623f69dfa
 2016-11-08 21:13:43 +00: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 296ddcace9 resolve merge conflicts of 70172d7 to stage-aosp-master am: 55883f660d am: 5d52303488 
am: 5fee534a8a  -s ours

Change-Id: Ibcb8796c73d236442e49285659ce04bc563e7932
 2016-11-08 20:04:08 +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 9c05a820f2 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
(cherry picked from commit c3292f3fcb)
 2016-11-07 15:33:34 -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 042bd117c9 Merge "tests: Fix unit/zip_test.cpp." am: ba41fba9e4 am: f46041a7d4 am: a99c6eab22 
am: d447124c00

Change-Id: I9d7520a555e50dd756a53a5dbec38ed8bd91873f
 2016-11-07 19:30:08 +00: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 74bda5f65b Add .clang-format style file. 
The file is forked from bionic project. It's mostly in Google style, with
some tweaks (e.g. 100 column limit). New CLs can be formatted with `git
clang-format --style=file`.

Test: N/A
Change-Id: I6fbd0ab851c03aa6de9987777c7da8cdca8964ed
 2016-11-07 10:02:33 -08: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 88ee9f61bf Merge "updater: Add a testcase for RenameFn()." am: d0daf7f7df am: 05a801ca8e am: 8269eb0d1f 
am: 63ae92ded4

Change-Id: Ia4558618507770ff9324883c917b8cc8d09792dd
 2016-11-04 21:15:12 +00: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 a4d0c0ab87 Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 am: 99adda9d67 am: 92097726ef 
am: 7770c6f93e

Change-Id: I384dc5295997963cc88231adad7a533f1ee9ef98
 2016-11-04 18:24:31 +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
Tianjie Xuandandroid-build-merger 92097726ef Merge "Cleanup the duplicates of logs rotation functions" am: e2d05c5658 
am: 99adda9d67

Change-Id: I66a74981f5e7432aaa49ae74a38fc87e17acc02f
 2016-11-04 18:17:31 +00:00
Tianjie Xuandandroid-build-merger 99adda9d67 Merge "Cleanup the duplicates of logs rotation functions" 
am: e2d05c5658

Change-Id: Ia63785d846ab05eca45ec1e548f7265d7feffdbb
 2016-11-04 18:14:01 +00:00