PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,102 Commits 1 Branch 0 Tags
c8eba4a036d1e6d22ea0be09de97594ce973fa93
Commit Graph

5102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao
c8eba4a036 Merge "rotate_logs: Clean up the header includes." 
am: 30ec005104

Change-Id: Icc10e4b6715a78deb6aab73829efa336821f849d
 2017-10-18 20:27:57 +00:00
Tao Bao
30ec005104 Merge "rotate_logs: Clean up the header includes." 2017-10-18 20:21:36 +00:00
Tao Bao
245c522588 rotate_logs: Clean up the header includes. 
Also clang-format rotate_logs.cpp to get consistent style.

Test: mmma bootable/recovery
Test: recovery_manual_test works on marlin.
Change-Id: I1210a346b97bbf0e1a8c3f8e3e73a7c114858ca8
 2017-10-18 11:08:37 -07:00
Tao Bao
f63dbde3ef Merge "otautil: Move RangeSet implementation into rangeset.cpp." 
am: bab1e8efc8

Change-Id: I5d41bdfe514e09c49bf2279ee6ca1b56ff5aab1f
 2017-10-17 16:04:13 +00:00
Tao Bao
bab1e8efc8 Merge "otautil: Move RangeSet implementation into rangeset.cpp." 2017-10-17 16:01:50 +00:00
Tao Bao
4568582002 otautil: Move RangeSet implementation into rangeset.cpp. 
Since it has grown much larger, users of the header shouldn't compile
and carry their full copies.

Also add missing header includes in imgdiff.cpp and imgdiff_test.cpp.

Test: mmma bootable/recovery
Test: recovery_unit_test; recovery_component_test; recovery_host_test
Change-Id: I88ca54171765e5606ab0d61580fbc1ada578fd7d
 2017-10-16 11:28:18 -07:00
Chih-hung Hsieh
97d9ae086a Merge "Fix owner email address." 
am: b4a8c6abd9

Change-Id: Ia637ddf881edb5db4b172d1ab2f75f321aee4c2a
 2017-10-12 18:22:56 +00:00
Chih-hung Hsieh
b4a8c6abd9 Merge "Fix owner email address." 2017-10-12 18:10:12 +00:00
Chih-Hung Hsieh
4945407f5b Fix owner email address. 
Test: normal build.
Bug: 67718313
Change-Id: Ia3144c634647f7a457810370a9f7275c19a8aa76
 2017-10-12 10:45:04 -07:00
Tao Bao
7722d8255c Merge "applypatch: Move to Soong." 
am: b058c5c481

Change-Id: Ibdee21116b15742ff8688352c6d49195a516132d
 2017-10-12 16:20:51 +00:00
Tao Bao
b058c5c481 Merge "applypatch: Move to Soong." 2017-10-12 16:12:48 +00:00
Tao Bao
92964b3b94 Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." 
am: 2ebc7dabff

Change-Id: I215fe78600a7799ca8be5ac479e50d1f00d70238
 2017-10-12 03:27:23 +00:00
Tao Bao
6cadc73dea Merge "Drop -Wno-unused-parameter." 
am: a0e9742796

Change-Id: Iabe3bf5471a02d3d3af64f6d249fd761bc7ac512
 2017-10-12 03:26:41 +00:00
Tao Bao
2ebc7dabff Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." 2017-10-12 03:22:41 +00:00
Tao Bao
a0e9742796 Merge "Drop -Wno-unused-parameter." 2017-10-12 03:22:17 +00:00
Dan Albert
b23cfd43da Merge "Add missing includes." 
am: 3c4e270123

Change-Id: I137b0abf7f9b72e458ff62b203dfb92bca58c97e
 2017-10-12 00:21:26 +00:00
Treehugger Robot
3c4e270123 Merge "Add missing includes." 2017-10-12 00:11:56 +00:00
Tao Bao
99f0d9e52b Drop -Wno-unused-parameter. 
The only one left is libedify. Will handle that in a separate CL.

Test: mmma bootable/recovery
Change-Id: I732a5f85229da90fd767bee2e46c5c95f529c396
 2017-10-11 16:56:12 -07:00
Tao Bao
582b67850f applypatch: Move to Soong. 
Test: mmma bootable/recovery
Change-Id: Ie163aff1c4c2b3b15bb705825779ada6bc38ad67
 2017-10-11 16:26:06 -07:00
Tao Bao
526699fc67 applypatch: Remove the Makefile for building imgdiff in Chrome OS. 
The former user system/update_engine has dropped the support for
imgdiff (https://android-review.googlesource.com/c/platform/system/update_engine/+/400427/).

Test: N/A
Change-Id: Ia8f770dc51800b45064c4affc3514cf513877edc
 2017-10-11 15:59:28 -07:00
Tao Bao
9e232f9f2a Merge "otafault: Add the missing #include <string>." 
am: 489155c44b

Change-Id: Ieee8b0305e2f42146cb11977dfde01658bd0d16f
 2017-10-11 21:30:21 +00:00
Tao Bao
7861ec16a0 Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." 
am: 1bf842471c

Change-Id: I9a05bd96e5d213e97f0c9aed3bd6aa973bc51327
 2017-10-11 21:30:02 +00:00
Tao Bao
489155c44b Merge "otafault: Add the missing #include <string>." 2017-10-11 21:15:24 +00:00
Tao Bao
1bf842471c Merge "otautil: #include <errno.h> for TEMP_FAILURE_RETRY." 2017-10-11 21:04:39 +00:00
Tao Bao
491880ed2f Merge "applypatch: Use shared lib for libbz." 
am: 6d7e4acf7e

Change-Id: I9a2303ae5c9ae0002954bcaae399986f7dd20d6b
 2017-10-11 21:00:26 +00:00
Tao Bao
6d7e4acf7e Merge "applypatch: Use shared lib for libbz." 2017-10-11 20:51:06 +00:00
Tao Bao
f0ca4f8f2d otafault: Add the missing #include <string>. 
Test: mmma bootable/recovery
Change-Id: If7610ba55a2d2dd4257ff38c44d252c9c6bbfe40
 2017-10-11 12:21:17 -07:00
Tao Bao
b9bffdffb9 otautil: #include <errno.h> for TEMP_FAILURE_RETRY. 
Test: mmma bootable/recovery
Change-Id: I5959303528c6f704f10ce153f6fcb2054ce35b1e
 2017-10-11 12:15:49 -07:00
Dan Albert
c8686b493c Add missing includes. 
Test: mma
Bug: None
Change-Id: I8b588dfbc00ef67557622d44700b331c7a31bde3
 2017-10-11 11:47:54 -07:00
Tao Bao
a3e032c549 Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." 
am: 46d8a3b604

Change-Id: Ic214efeb5a1051109598f7011937a406da26da1b
 2017-10-11 18:43:04 +00:00
Tao Bao
44fc7b1e79 applypatch: Use shared lib for libbz. 
We have shared lib target for libbz now (and libbz.so is already on
device because of /system/bin/bzip2).

Test: m applypatch
Change-Id: I5fe2468a8d535840245f081a92d436240dddbf6b
 2017-10-11 11:35:08 -07:00
Tao Bao
46d8a3b604 Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." 2017-10-11 18:31:36 +00:00
Tao Bao
28f6938862 Merge "Move rangeset.h and print_sha1.h into otautil." 
am: ff9b6f63a2

Change-Id: I4fea3584f64b273922ff20e9661c02a34ccca2f8
 2017-10-11 17:15:26 +00:00
Tao Bao
ff9b6f63a2 Merge "Move rangeset.h and print_sha1.h into otautil." 2017-10-11 17:09:25 +00:00
Tao Bao
09e468f84c Move rangeset.h and print_sha1.h into otautil. 
Also drop the "bootable/recovery" path in LOCAL_C_INCLUDES from
applypatch modules.

Test: lunch aosp_{angler,bullhead,fugu,dragon,sailfish}-userdebug;
      mmma bootable/recovery
Change-Id: Idd602a796894f971ee4f8fa3eafe36c42d9de986
 2017-10-10 15:52:11 -07:00
Tao Bao
3db3205b2a applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive. 
This reduces the size of /system/bin/applypatch by ~69KB
(aosp_bullhead-userdebug).

Also remove the unneeded libcutils dependency.

Test: mmma bootable/recovery
Test: Check that /system/bin/install-recovery.sh successfully installs
      the recovery image.
Change-Id: I5063be9a9b7b8029d45ab5c2a7c45ef2cda81d26
 2017-10-10 15:34:49 -07:00
Tao Bao
bc131ef1bd Merge "otautil: Fix mac build." 
am: eb8a064066

Change-Id: Ia757cdeb858e2d60fab17ecbf74eb6d39e650549
 2017-10-10 18:45:55 +00:00
Tao Bao
eb8a064066 Merge "otautil: Fix mac build." 2017-10-10 18:34:53 +00:00
Tao Bao
c13d2ec772 otautil: Fix mac build. 
bootable/recovery/otautil/SysUtil.cpp:103:19: error: use of undeclared identifier 'mmap64'; did you mean 'mmap'?
  void* reserve = mmap64(nullptr, blocks * blksize, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
                  ^~~~~~

Test: mmma bootable/recovery
Change-Id: I22d7dc4d994069201e5a633cec21421e2c4182fa
 2017-10-10 10:56:09 -07:00
Tao Bao
28e8a2c43a Merge changes from topic "libedify-header" 
am: abade5af15

Change-Id: I8a2c066f807b85139c24ec44f504d19549e1aa7d
 2017-10-10 16:19:27 +00:00
Tao Bao
abade5af15 Merge changes from topic "libedify-header" 
* changes:
  edify: Export the header and move to Soong.
  Revert "Revert "Move error_code.h into otautil.""
 2017-10-10 16:15:30 +00:00
Tao Bao
e6f7f95d34 edify: Export the header and move to Soong. 
Also make matching changes to applypatch modules which include
edify/expr.h.

Test: mmma bootable/recovery
Change-Id: Ia72be3caa010d7f56a70add2da345e631b306378
 2017-10-09 14:08:00 -07:00
Tao Bao
1fc5bf353a Revert "Revert "Move error_code.h into otautil."" 
This reverts commit 26436d6d60 to re-land
"Move error_code.h into otautil.".

This way it stops requiring relative path ".." in LOCAL_C_INCLUDES
(uncrypt and edify). Soong doesn't accept non-local ".." in
"local_include_dirs".

This CL needs to land with device-specific module changes (e.g. adding
the dependency on libotautil).

Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug;
      mmma bootable/recovery
Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96
 2017-10-09 14:07:54 -07:00
Tao Bao
b7c0ce4201 Merge "applypatch: Forward declare struct Value." 
am: 7a3fc2de8e

Change-Id: I1ac5bb6eda60d9d9728ce149d2e9cbc37b82acac
 2017-10-09 21:04:03 +00:00
Tao Bao
7a3fc2de8e Merge "applypatch: Forward declare struct Value." 2017-10-09 20:57:58 +00:00
Tao Bao
38d78d19b9 applypatch: Forward declare struct Value. 
And move '#include "edify/expr.h"' into .cpp files. This breaks the
transitive dependency on libedify. Modules that include
"applypatch/applypatch.h" don't need to add libedify into their
dependency list, unless they really need anything from libedify.

Build libedify static library for host, which is needed by
libimgpatch.

Test: mmma bootable/recovery
Change-Id: Ibb53d322579fcbf593438d058d9bcee240625941
 2017-10-09 11:50:09 -07:00
Tao Bao
e196918f54 Merge "Don't include "error_code.h" in edify/expr.h." 
am: d999ced1d1

Change-Id: I47512a7c6c02bcc5c6558f74963e83648e03f5d4
 2017-10-06 14:47:04 +00:00
Tao Bao
d999ced1d1 Merge "Don't include "error_code.h" in edify/expr.h." 2017-10-06 14:37:21 +00:00
Tao Bao
3b3f2f5711 Merge "vr_ui: drawing changes" 
am: 9a874a4e5f

Change-Id: Ib36e4a57998fe2de3599181bd48bf6887336edbe
 2017-10-06 14:35:21 +00:00
Tao Bao
9a874a4e5f Merge "vr_ui: drawing changes" 2017-10-06 14:28:22 +00:00