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

5281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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 622253f29f Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54 
am: 3bc65953ab

Change-Id: I1ab6b785992cb5047f193762960d4f535d0bcee1
 2017-10-06 14:57:00 +00: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 df6d1c0c51 Merge "vr_ui: drawing changes" am: 9a874a4e5f am: 3b3f2f5711 
am: 0a5e39f180

Change-Id: I40c01de24aef5f6f8d3def5fd06412263bab81eb
 2017-10-06 14:39:43 +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 d83bd5acdf Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcd 
am: ab19506094

Change-Id: I41c4fe5ac3ae5c7288818108060040122e52bcd2
 2017-10-05 19:14:04 +00: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
Luke Song 92eda4db6c vr_ui: drawing changes 
Change drawing of horizontal bars.
Implement image and background drawing.

Bug: 65556996
Test: Viewed graphics test
Change-Id: I68ddd997123607dbebf972af5a455ce8ef0c7075
 2017-10-05 12:02:13 -07:00
Tao Bao 9baa19012a Merge "graphics: add rotation logic" 2017-10-05 19:00:50 +00:00
Tao Bao 874d9c0f73 Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dc 
am: 4f63cc5e09

Change-Id: Ib425bc370d5083cc0273ead3dc2ae057467e2720
 2017-10-05 17:30:25 +00:00
Tao Bao 4f63cc5e09 Merge "Revert "Move error_code.h into otautil."" am: b23d29642d 
am: b87edb00dc

Change-Id: I43d041f1f59766066240f6e535f1b9839e783c25
 2017-10-05 17:28:20 +00:00
Tao Bao b87edb00dc Merge "Revert "Move error_code.h into otautil."" 
am: b23d29642d

Change-Id: Ib5b7fcf9c627bc1ee09b4abafc54e91c8e788edc
 2017-10-05 17:27:02 +00:00
Tao Bao b23d29642d Merge "Revert "Move error_code.h into otautil."" 2017-10-05 17:18:04 +00:00
Tao Bao 26436d6d60 Revert "Move error_code.h into otautil." 
This reverts commit 623fe7e701.

Reason for revert: Need to address device-specific modules.

Change-Id: Ib7a4191e7f193dfff49b02d3de76dda856800251
 2017-10-05 17:16:31 +00:00
Tao Bao 16f2932619 Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 
am: 63876d765a

Change-Id: Ia97980295e62384f1244c2ad68a6f7335f82d9b5
 2017-10-05 16:13:28 +00:00
Tao Bao 63876d765a Merge "Move error_code.h into otautil." am: 916e155bab 
am: 73831e0636

Change-Id: Id03ad003349541d7d8db54b3d93da011ba9ee0cd
 2017-10-05 16:11:17 +00:00
Tao Bao 73831e0636 Merge "Move error_code.h into otautil." 
am: 916e155bab

Change-Id: I53265b03c12bfd022a634f8633f2d2e15a5e641b
 2017-10-05 16:09:19 +00:00
Tao Bao 916e155bab Merge "Move error_code.h into otautil." 2017-10-05 16:04:02 +00:00
Tao Bao 45de34c58c Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d 
am: 159db1dd49

Change-Id: Ie57c93107d0065f77970d30c36f69203d19c0017
 2017-10-04 16:11:42 +00:00
Tao Bao 159db1dd49 Merge "edify: Remove edify_parser." am: 281d4eefb1 
am: dfbe70b79d

Change-Id: I74e065a440dd3397e3a3b04b73c115ff1b33351a
 2017-10-04 16:01:33 +00:00
Tao Bao dfbe70b79d Merge "edify: Remove edify_parser." 
am: 281d4eefb1

Change-Id: I821c8d191110be896b775a95a5d5ecb472c8cfe1
 2017-10-04 15:59:04 +00:00
Tao Bao 623fe7e701 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".

Test: mmma bootable/recovery
Change-Id: Ia4649789cef2aaeb2785483660e9ea5a8b389c62
 2017-10-04 08:55:24 -07:00
Tao Bao 281d4eefb1 Merge "edify: Remove edify_parser." 2017-10-04 15:48:18 +00:00
Tao Bao 010c92d2d4 Merge "otautil: Export headers." am: 2cedab7af9 am: b50d7cf9c9 
am: d284e36fc6

Change-Id: I7b7f601bed669428fc8ded3fee9e15a732e90c3c
 2017-10-03 23:43:40 +00:00