Commit Graph

5066 Commits

Author SHA1 Message Date
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
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 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 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 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 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 b50d7cf9c9 Merge "otautil: Export headers."
am: 2cedab7af9

Change-Id: Ib1849336792d21b0c754b6ff9fb9dc67b69a3108
2017-10-03 23:39:15 +00:00
Treehugger Robot 2cedab7af9 Merge "otautil: Export headers." 2017-10-03 23:34:36 +00:00
Luke Song c6e12b5f43 Merge "screen_ui: stage marker positioning"
am: 16817312a6

Change-Id: I4260be142441ea9473ecd121f7fd6b3090bb331c
2017-10-03 23:17:16 +00:00
Treehugger Robot 16817312a6 Merge "screen_ui: stage marker positioning" 2017-10-03 23:07:35 +00:00
Tao Bao 6e4a9ae51a edify: Remove edify_parser.
It used to be containing some unit tests for basic edify syntax, which
has been moved into recovery_component_test (commit
d770d2e7af).

The edify_parser host tool supports edify built-in functions only, but
doesn't recognize the ones defined in updater. This makes it much less
useful to do any real analyzing work.

Test: mmma bootable/recovery
Change-Id: I3c12f5402d2d6698e0ef5ac6c2e7804c0fbba78a
2017-10-03 14:55:23 -07:00
Tao Bao cfe53c2c01 otautil: Export headers.
Test: mmma bootable/recovery
Change-Id: Ic01b68e2a394d578fc9fc09da2dabe9061b98122
2017-10-03 14:41:32 -07:00
Tao Bao 8b8c7eb442 Merge "roots: Fix an issue with volume_for_path()."
am: dd7a4b5264

Change-Id: I60b868ec677a252faeed6821cfe28f093ccd754a
2017-10-02 21:06:11 +00:00
Tao Bao dd7a4b5264 Merge "roots: Fix an issue with volume_for_path()." 2017-10-02 20:48:50 +00:00
Chih-Hung Hsieh b5437e3e1b Merge "Use -Werror in bootable/recovery"
am: 88aa128e22

Change-Id: I2aa136c0137f621e12f6fc4062b804b6e1c788f9
2017-10-02 20:44:41 +00:00
Treehugger Robot 88aa128e22 Merge "Use -Werror in bootable/recovery" 2017-10-02 20:25:32 +00:00
Chih-Hung Hsieh 5aa77ca73d Use -Werror in bootable/recovery
* Move -Werror from cppflags to cflags.

Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: I59147fe24d8b48a0403c67ba07d4d384b8e9c5a3
2017-10-02 11:45:48 -07:00
Tao Bao 3e18f2bf40 roots: Fix an issue with volume_for_path().
The earlier commit in 2dfc1a3898
unintentionally changed the behavior. It gives a different result when
looking up non-existent mount points (e.g. /cache on marlin).

The logic behind volume_for_path("/xyz") is unclear:
- It's fine to return non-null value if it's called by
  ensure_path_mounted() before accessing that file "/xyz". (Just based
  on the function name, we're not actually having this case.)
- It should return nullptr if the caller is interested in the existence
  of that particular mount point "/xyz".

This CL renames the function to volume_for_mount_point(), which does an
exact match by querying the given mount point from libfs_mgr. The former
volume_for_path() has been moved down to function scope for serving
ensure_path_mounted() only.

Test: Build and boot into recovery on bullhead and marlin respectively.
      'View recovery logs'.
Test: 'Mount /system'
Test: 'Apply update from ADB'
Change-Id: I1a16390f57540cae08a2b8f3d439d17886975217
2017-10-02 11:18:13 -07:00
Tao Bao 0fa08924c6 Merge "roots: Remove #include "common.h"."
am: e8ee697364

Change-Id: Ie2ef76fe06bfb181a0bc715762cb3f4a7912c376
2017-10-02 17:55:13 +00:00
Tao Bao e8ee697364 Merge "roots: Remove #include "common.h"." 2017-10-02 17:44:27 +00:00
Luke Song eee1e7656f screen_ui: stage marker positioning
Small fix to position stage markers above screen margin.

Bug: 65556996
Test: Viewed graphics test
Change-Id: Idb4a56b06b8ec4e6653b3d3f3a446fa491f5ccb7
2017-09-29 14:19:23 -07:00
Tao Bao 2812e5d16b Merge "otafault: Move to soong."
am: 475794a9af

Change-Id: Iee13c083650853205901c1a814903943356cc5e7
2017-09-29 21:14:31 +00:00
Tao Bao 475794a9af Merge "otafault: Move to soong." 2017-09-29 21:07:21 +00:00
Tao Bao 0018b93b27 Merge "otafault: Move headers under otafault/."
am: 4289deaf82

Change-Id: Ia6d10a55a9a70205982c7ff442b24d07ed1697b6
2017-09-29 19:38:55 +00:00
Tao Bao 4289deaf82 Merge "otafault: Move headers under otafault/." 2017-09-29 19:30:16 +00:00
Tao Bao a26e32d2a3 otafault: Move to soong.
Test: mmma bootable/recovery
Change-Id: I5f2520ea457ba66743aa3aa1d5b3b488a93084a3
2017-09-29 11:05:24 -07:00
Tao Bao ad774b2970 roots: Remove #include "common.h".
And add the missing include of <string.h> (e.g. for strcmp(3)).

Minor update to the arg of fs_mgr_get_entry_for_mount_point(), which now
accepts std::string.

Test: mmma bootable/recovery
Change-Id: I9cb8c31fe71b5a053f4d84bf1aba00e96c02ed03
2017-09-29 11:03:08 -07:00
Tianjie Xu 297a994416 Merge "Move the png open and destroy functions into a class"
am: e687c5a1e1

Change-Id: I826603e04c08408210ebfd197bba8d955b073d65
2017-09-29 17:39:56 +00:00
Tianjie Xu e687c5a1e1 Merge "Move the png open and destroy functions into a class" 2017-09-29 17:34:20 +00:00
Tao Bao d33b2f86b7 otafault: Move headers under otafault/.
Test: mmma bootable/recovery
Change-Id: I3ceb72f703c7c2857d656c137d71baa1fccd8238
2017-09-29 10:29:53 -07:00