Commit Graph

5316 Commits

Author SHA1 Message Date
Tao Bao 4ffbf43de3 Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff am: 92964b3b94
am: a7b8be564a

Change-Id: I2d43ffe9e69b75907c8b3846f1d56cf1bf6cc0a6
2017-10-12 03:35:43 +00:00
Tao Bao 1431cbec0b Merge "Drop -Wno-unused-parameter." am: a0e9742796 am: 6cadc73dea
am: 44ddef71dc

Change-Id: If29463d5b5b15405dbcb90554b756e4633f7f6eb
2017-10-12 03:35:20 +00:00
Tao Bao a7b8be564a Merge "applypatch: Remove the Makefile for building imgdiff in Chrome OS." am: 2ebc7dabff
am: 92964b3b94

Change-Id: I21dcd0e8dc0020a7b45a85b53072284fe97c3f55
2017-10-12 03:32:11 +00:00
Tao Bao 44ddef71dc Merge "Drop -Wno-unused-parameter." am: a0e9742796
am: 6cadc73dea

Change-Id: Ib9bb6362481315466c12575b62900bf61747eafc
2017-10-12 03:31:29 +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 304fe6c927 Merge "Add missing includes." am: 3c4e270123 am: b23cfd43da
am: 57caa90f74

Change-Id: I87c9b84c63806449f3614b95402d62bc617e1c09
2017-10-12 00:37:03 +00:00
Dan Albert 57caa90f74 Merge "Add missing includes." am: 3c4e270123
am: b23cfd43da

Change-Id: I4c50eea579d610c5590ecfaace70f2761038204a
2017-10-12 00:22:57 +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 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 3787b72249 Merge "otafault: Add the missing #include <string>." am: 489155c44b am: 9e232f9f2a
am: a27f973999

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

Change-Id: I43050a07769f1b2b0f82ec00b056509fd2fd53f4
2017-10-11 21:42:53 +00:00
Tao Bao a27f973999 Merge "otafault: Add the missing #include <string>." am: 489155c44b
am: 9e232f9f2a

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

Change-Id: Ia53a4fb2ca871cb688ca52902b4790e28531dc05
2017-10-11 21:37:05 +00: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 2e5047f477 Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e am: 491880ed2f
am: e353274491

Change-Id: Ie0f1ddd42b0e5559b34c1bd2db1cbd7d5964cc27
2017-10-11 21:15:58 +00:00
Tao Bao 489155c44b Merge "otafault: Add the missing #include <string>." 2017-10-11 21:15:24 +00:00
Tao Bao e353274491 Merge "applypatch: Use shared lib for libbz." am: 6d7e4acf7e
am: 491880ed2f

Change-Id: I435d214295a39351fb447dabdcbe07ca51705b67
2017-10-11 21:07:53 +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
Tao Bao de0118f803 Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604 am: a3e032c549
am: 9bfdc55472

Change-Id: I2d4e65e2784f645c7c248cc01c3b60f21402d447
2017-10-11 19:06:07 +00:00
Tao Bao 9bfdc55472 Merge "applypatch: Use shared libs for libbase/libcrypto/liblog/libziparchive." am: 46d8a3b604
am: a3e032c549

Change-Id: Iac0050ea809d797915f619114b16c7bbcc06804a
2017-10-11 18:54:05 +00: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 08912cede5 Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2 am: 28f6938862
am: 684f239b4b

Change-Id: I981f541e444900baf1de89064d57752e1a85587d
2017-10-11 17:23:10 +00:00
Tao Bao 684f239b4b Merge "Move rangeset.h and print_sha1.h into otautil." am: ff9b6f63a2
am: 28f6938862

Change-Id: I2742e3cdff2ebef012a6194030de8cb19dfd55e5
2017-10-11 17:19:13 +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 13752ae25c Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd
am: 814f05d853

Change-Id: I0fb78094a2ef258ef1d463c9784249fbdae7fff3
2017-10-10 19:06:36 +00:00
Tao Bao 814f05d853 Merge "otautil: Fix mac build." am: eb8a064066
am: bc131ef1bd

Change-Id: I610fad4289df35d0327ecdd91c271a90f0dd45df
2017-10-10 18:53:27 +00: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 43e4eddd66 Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a
am: eaf3e895fe

Change-Id: Ib25565ad20dd7ba2a22671b317a63ee68a38f404
2017-10-10 16:31:44 +00:00
Tao Bao eaf3e895fe Merge changes from topic "libedify-header" am: abade5af15
am: 28e8a2c43a

Change-Id: I0492beacef5c544beb2e3fa0ce0fe25070a0348a
2017-10-10 16:28:09 +00: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 91a034974c Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201
am: b53d8c6062

Change-Id: I4f0fb9418a41fe815f4cce89c3889ddd42bd35b1
2017-10-09 21:30:26 +00:00