PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,159 Commits 1 Branch 0 Tags
deaf2662d7ba0ee4672d5cc2a4ff7a50108e8079
Commit Graph

7159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 f859b684a6 Merge changes from topic "libedify-header" am: abade5af15 am: 28e8a2c43a am: eaf3e895fe 
am: 43e4eddd66

Change-Id: Ibe24c579659220f3fb39ebeeecba361b110079ed
 2017-10-10 16:39:20 +00: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
android-build-team Robot f5f8cd0c50 Snap for 4386413 from cbd8479410 to pi-release 
Change-Id: I0448e9a17c96188191a773951620b020783f5e22
 2017-10-10 08:01:52 +00:00
Tao Bao cbd8479410 Merge "applypatch: Forward declare struct Value." am: 7a3fc2de8e am: b7c0ce4201 am: b53d8c6062 
am: 91a034974c

Change-Id: Ibbe7d61a6cd96f9bd79dd8b5c1b4d0538e73b35e
 2017-10-09 22:16:24 +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
android-build-team Robot 6f5ed7b28a Snap for 4383207 from 2bf82666c3 to pi-release 
Change-Id: Ib8a14771447d050803a2d626be221273e8c177b9
 2017-10-07 08:10:27 +00:00
Tao Bao 2bf82666c3 Merge "Don't include "error_code.h" in edify/expr.h." am: d999ced1d1 am: e196918f54 am: 3bc65953ab 
am: 622253f29f

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

Change-Id: Id1c352cc7b001f604270358fa535eb750e0c0646
 2017-10-06 14:41:45 +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
android-build-team Robot 9ffb19e21e Snap for 4380820 from b59132d66c to pi-release 
Change-Id: Ied46e4189b187baf0d830366083536da3f77620d
 2017-10-06 08:04:47 +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 b59132d66c Merge "graphics: add rotation logic" am: 9baa19012a am: 284df0abcd am: ab19506094 
am: d83bd5acdf

Change-Id: I52859719681aae6f228d5ae68e36603dacbf6fe6
 2017-10-05 19:20:02 +00: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 d462b2677d Merge "Revert "Move error_code.h into otautil."" am: b23d29642d am: b87edb00dc am: 4f63cc5e09 
am: 874d9c0f73

Change-Id: I248a401c4629fe1460f17febd5d8ebd478308586
 2017-10-05 17:32:37 +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 12ffa8bfbf Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 am: 63876d765a 
am: 16f2932619

Change-Id: I819c5c2345123128ba57c1a23607632b5893745c
 2017-10-05 16:15:45 +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 1ab5676956 Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d am: 159db1dd49 
am: 45de34c58c

Change-Id: Ib7bc3e33b26f7bbda996ed500847e1cebbf592d7
 2017-10-04 16:27:47 +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