Tianjie Xu and android-build-merger
d7d0cc4c08
Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23 am: c1ab2bb535
...
am: 16a4cbe79b
2017-11-06 19:07:13 +00:00
Tianjie Xu and android-build-merger
16a4cbe79b
Merge "Switch to bionic gtest in bootable/recovery" am: bf41f2aa23
...
am: c1ab2bb535
2017-11-06 19:04:34 +00:00
Tianjie Xu and android-build-merger
c1ab2bb535
Merge "Switch to bionic gtest in bootable/recovery"
...
am: bf41f2aa23
2017-11-06 19:02:01 +00:00
Tianjie Xu and Gerrit Code Review
bf41f2aa23
Merge "Switch to bionic gtest in bootable/recovery"
2017-11-06 18:56:27 +00:00
Tao Bao and android-build-merger
4d9ce1aa50
Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983 am: 6d61e2123b
...
am: da62ff4218
2017-11-04 14:36:28 +00:00
Tao Bao and android-build-merger
da62ff4218
Merge "Clean up fuse_sideload and add a testcase." am: 73dca3e983
...
am: 6d61e2123b
2017-11-04 14:33:56 +00:00
Tao Bao and android-build-merger
6d61e2123b
Merge "Clean up fuse_sideload and add a testcase."
...
am: 73dca3e983
2017-11-04 14:31:55 +00:00
Tao Bao and Gerrit Code Review
73dca3e983
Merge "Clean up fuse_sideload and add a testcase."
2017-11-04 14:27:48 +00:00
Tao Bao
91a7aa4577
Clean up fuse_sideload and add a testcase.
...
This CL mainly changes:
a) moving the interface in struct provider_vtab to std::function;
b) code cleanup, such as moving the declaration closer to the uses,
using explicit type conversion.
Test: recovery_component_test
Test: minadbd_test
Test: Sideload a package on marlin.
Change-Id: Id0e3c70f1ada54a4cd985b54c84438c23ed4687e
2017-11-03 18:30:41 -07:00
Jin Qian and android-build-merger
a08a33b129
Merge "recovery: remove make_ext4fs from updater" am: 3f06512714 am: 59b20d6565
...
am: 9a631d2764
2017-11-03 23:29:58 +00:00
Jin Qian and android-build-merger
9a631d2764
Merge "recovery: remove make_ext4fs from updater" am: 3f06512714
...
am: 59b20d6565
2017-11-03 23:26:23 +00:00
Jin Qian and android-build-merger
59b20d6565
Merge "recovery: remove make_ext4fs from updater"
...
am: 3f06512714
2017-11-03 23:22:23 +00:00
Treehugger Robot and Gerrit Code Review
3f06512714
Merge "recovery: remove make_ext4fs from updater"
2017-11-03 23:18:25 +00:00
Jin Qian and android-build-merger
304d8f3926
Merge "recovery: fix library dependency" am: 0da645fefa am: 4d079261e5
...
am: 87c005bff7
2017-11-03 22:48:55 +00:00
Jin Qian and android-build-merger
87c005bff7
Merge "recovery: fix library dependency" am: 0da645fefa
...
am: 4d079261e5
2017-11-03 22:39:26 +00:00
Jin Qian and android-build-merger
4d079261e5
Merge "recovery: fix library dependency"
...
am: 0da645fefa
2017-11-03 22:29:20 +00:00
Treehugger Robot and Gerrit Code Review
0da645fefa
Merge "recovery: fix library dependency"
2017-11-03 22:16:55 +00:00
Tianjie Xu
a88cc5440e
Switch to bionic gtest in bootable/recovery
...
We encountered segfaults in Imgdiff host tests due to the failure to
reset states of getopt. The problem can be solved by switching to use
bionic's gtest where a new process is forked for each test.
Also modify the recovery_component_test to make sure it runs in parallel.
Changes include:
1. Merge the writes to misc partition into one single test.
2. Change the hard coded location "/cache/saved.file" into a configurable
variable.
Bug: 67849209
Test: recovery tests pass
Change-Id: I165d313f32b83393fb7922c5078636ac40b50bc2
2017-11-03 14:09:11 -07:00
Jin Qian
502fd1c5e8
recovery: remove make_ext4fs from updater
...
Bug: 64395169
Change-Id: I6f6a4f82b225435c6ad5c828e110fa135e6f7579
2017-11-03 13:54:59 -07:00
Jin Qian
000148dbc9
recovery: fix library dependency
...
After removing some deadcode from libext4_utils, libz is optimized
out by linker. However, it's still required by libvintf. Moving libz
down the list fixed the build.
Bug: 64395169
Change-Id: I23ecd70c83af83a219faced59d8227dc3c4e43d5
2017-11-03 13:43:48 -07:00
Tao Bao and android-build-merger
61b272558f
Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cf am: fc8066feed
...
am: c08ec028f2
2017-11-03 19:03:37 +00:00
Tao Bao and android-build-merger
c08ec028f2
Merge "tests: Clean up the files in TemporaryDir." am: 2cf44d08cf
...
am: fc8066feed
2017-11-03 18:59:36 +00:00
Tao Bao and android-build-merger
fc8066feed
Merge "tests: Clean up the files in TemporaryDir."
...
am: 2cf44d08cf
2017-11-03 18:57:36 +00:00
Treehugger Robot and Gerrit Code Review
2cf44d08cf
Merge "tests: Clean up the files in TemporaryDir."
2017-11-03 18:51:34 +00:00
Tao Bao and android-build-merger
9cbe11ee32
Merge "Add a repohook to clang-format changes." am: 439263cb83 am: f3e2017309
...
am: e8d7946827
2017-11-03 03:35:46 +00:00
Tao Bao and android-build-merger
e8d7946827
Merge "Add a repohook to clang-format changes." am: 439263cb83
...
am: f3e2017309
2017-11-03 03:33:43 +00:00
Tao Bao and android-build-merger
f3e2017309
Merge "Add a repohook to clang-format changes."
...
am: 439263cb83
2017-11-03 03:31:14 +00:00
Tao Bao and Gerrit Code Review
439263cb83
Merge "Add a repohook to clang-format changes."
2017-11-03 03:27:15 +00:00
Xin Li and android-build-merger
9580c07538
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master am: 04a8b2b532
...
am: b127b6c4a8
2017-11-03 01:02:00 +00:00
Xin Li and android-build-merger
b127b6c4a8
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master
...
am: 04a8b2b532
2017-11-03 01:00:30 +00:00
Tao Bao
6b1aae376a
Add a repohook to clang-format changes.
...
It would clang-format according to the local style file in
.clang-format, unless explicitly skipped with --no-verify.
An example output is as follows:
[COMMIT dda6b1ee4247] test
[FAILED] clang_format
The following files have formatting errors:
screen_ui.cpp
You can run `/mnt/aosp/aosp-master/tools/repohooks/tools/clang-format.py --fix --clang-format /mnt/aosp/aosp-master/prebuilts/clang/host/linux-x86/clang-stable/bin/clang-format --git-clang-format /mnt/aosp/aosp-master/prebuilts/clang/host/linux-x86/clang-stable/bin/git-clang-format --style file --commit dda6b1ee424710760bbab4421e95239fa6a2b40d` to fix this
[COMMIT be69a2c4ba16] Add a repohook to clang-format the change.
[RUNNING 2/2] clang_format
An automatic fix can be attempted for the "clang_format" hook. Do you want to run it? (Yes/no)?
Fix successfully applied. Amend the current commit before attempting to upload again.
More details about repohooks can be found at:
https://android.googlesource.com/platform/tools/repohooks/
Test: `repo upload` a CL.
Change-Id: Ie8203a317eb3be7acd5592e03374873997647aa0
2017-11-02 16:23:58 -07:00
Xin Li
04a8b2b532
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from
...
oc-mr1-dev-plus-aosp into stage-aosp-master
Change-Id: Ie321cc4ce4a2324ca7bf0f3493f23ea7999765b8
2017-11-02 15:49:26 -07:00
TreeHugger Robot and Android (Google) Code Review
3fad821144
Merge "recovery: remove make_ext4fs from updater"
2017-11-02 22:03:24 +00:00
Jin Qian
ddc850adc3
recovery: remove make_ext4fs from updater
...
Bug: 64395169
Change-Id: I6f6a4f82b225435c6ad5c828e110fa135e6f7579
2017-11-02 11:58:12 -07:00
Tianjie Xu and android-build-merger
8202d21882
Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bc am: 57e16e4f77
...
am: 1d71857179
2017-11-02 17:59:20 +00:00
Tianjie Xu and android-build-merger
1d71857179
Merge "Add libbrotli as a dependency for libbsdiff" am: 43f194c8bc
...
am: 57e16e4f77
2017-11-02 17:57:09 +00:00
Tianjie Xu and android-build-merger
57e16e4f77
Merge "Add libbrotli as a dependency for libbsdiff"
...
am: 43f194c8bc
2017-11-02 17:54:37 +00:00
Tianjie Xu and Gerrit Code Review
43f194c8bc
Merge "Add libbrotli as a dependency for libbsdiff"
2017-11-02 17:50:40 +00:00
Tao Bao
54c1db4b3e
tests: Clean up the files in TemporaryDir.
...
~TemporaryDir() calls rmdir(2) directly, which works with empty
directories only.
Test: Run recovery_host_test; No leftover on host.
Test; Run recovery_component_test on marlin; No leftover on device.
Change-Id: Ib510efb16eeda61b34161e2b386499e6cb79a4ca
2017-11-01 22:34:51 -07:00
Tao Bao and android-build-merger
efb6a0b7a6
update_verifier: Fix the wrong computation with group_range_count. am: 559a6d1d2a
...
am: ba1217ee00
2017-11-02 00:44:28 +00:00
Tao Bao and android-build-merger
ba1217ee00
update_verifier: Fix the wrong computation with group_range_count.
...
am: 559a6d1d2a
2017-11-02 00:41:59 +00:00
Tianjie Xu
8c28081039
Add libbrotli as a dependency for libbsdiff
...
Bug: 34220646
Test: mma
Change-Id: If00285943fff8226f1bc7239db5570a277739904
2017-11-01 15:30:05 -07:00
Tianjie Xu and android-build-merger
03860d0775
Merge "Fix the size mismatch in imgdiff" am: dec77a454e am: ff7c186f66
...
am: 92fcada348
2017-11-01 19:15:40 +00:00
Tianjie Xu and android-build-merger
92fcada348
Merge "Fix the size mismatch in imgdiff" am: dec77a454e
...
am: ff7c186f66
2017-11-01 19:11:39 +00:00
Tianjie Xu and android-build-merger
ff7c186f66
Merge "Fix the size mismatch in imgdiff"
...
am: dec77a454e
2017-11-01 19:04:43 +00:00
Tianjie Xu and Gerrit Code Review
dec77a454e
Merge "Fix the size mismatch in imgdiff"
2017-11-01 18:56:46 +00:00
Tianjie Xu
113fe05ee0
Fix the size mismatch in imgdiff
...
As we construct the deflate entries of the target zip file with
random data, the total size of the zip file may vary from case
to case. This leads to occasional failures in the split test for
deflate large apk files. This CL fixes the issue by adding two static
zip files in the testdata instead of generating them dynamically.
Bug: 67849209
Test: run the deflate_large_test repeatedly
Change-Id: Iaeffad9205adefa10c9f62f9f088c33c4360a650
2017-10-31 23:31:02 -07:00
Tao Bao and android-build-merger
1385908bdb
Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9 am: 78fa902920
...
am: 80945895bb
2017-10-30 17:56:17 +00:00
Tao Bao and android-build-merger
80945895bb
Merge "update_verifier: Fix the wrong computation with group_range_count." am: 011af6e1a9
...
am: 78fa902920
2017-10-30 17:51:45 +00:00
Tao Bao and android-build-merger
78fa902920
Merge "update_verifier: Fix the wrong computation with group_range_count."
...
am: 011af6e1a9
2017-10-30 17:47:14 +00:00
