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
6cadc73dea
Merge "Drop -Wno-unused-parameter."
...
am: a0e9742796
Change-Id: Iabe3bf5471a02d3d3af64f6d249fd761bc7ac512
2017-10-12 03:26:41 +00:00
Tao Bao
a0e9742796
Merge "Drop -Wno-unused-parameter."
2017-10-12 03:22:17 +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
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
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
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
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
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
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
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
b53d8c6062
Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e
...
am: b7c0ce4201
Change-Id: I9ada801445bf3db83a50c2ef33c37301ea4eae1b
2017-10-09 21:06:18 +00: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
3bc65953ab
Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1
...
am: e196918f54
Change-Id: Ic3d0ecb9377429eee45635847e564f347138398a
2017-10-06 14:51:47 +00: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
0a5e39f180
Merge "vr_ui: drawing changes" am: 9a874a4e5f
...
am: 3b3f2f5711
Change-Id: I50d1a13b65cf363e55ae62cc1594ffb8932b19ed
2017-10-06 14:38:28 +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
Tao Bao
0bf20d5133
Don't include "error_code.h" in edify/expr.h.
...
Use forward declartion to avoid pull in the module that contains
error_code.h (trying to move it into libotautil). Otherwise all the
modules that include "edify/expr.h" need to depend on the module that
exports error_code.h.
.cpp sources should include "error_code.h" explicitly to use the enums.
Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug;
mmma bootable/recovery
Change-Id: Ic82db2746c7deb866e8cdfb3c57e0b1ecc71c4dc
2017-10-05 12:46:18 -07:00
Tao Bao
ab19506094
Merge "graphics: add rotation logic" am: 9baa19012a
...
am: 284df0abcd
Change-Id: If6fe816252edf235eb9773dad977ab7f44367448
2017-10-05 19:12:03 +00:00
Tao Bao
284df0abcd
Merge "graphics: add rotation logic"
...
am: 9baa19012a
Change-Id: I69220812eb3661eaa5f54d111fb3d143787ebcdf
2017-10-05 19:10:03 +00:00