Commit graph

5404 commits

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

Change-Id: I0e0a7da7c834cdc686d86dcc3ccc033a2317a8e4
2017-10-03 23:41:33 +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
d3f4501676 Merge "screen_ui: stage marker positioning" am: 16817312a6 am: c6e12b5f43
am: dca0a20063

Change-Id: I0ec410171841a7346d155541384b7d4504ff1a24
2017-10-03 23:25:27 +00:00
Luke Song
dca0a20063 Merge "screen_ui: stage marker positioning" am: 16817312a6
am: c6e12b5f43

Change-Id: Ife75bb7a33a1ebd7f32369fcd8b349876c8e2532
2017-10-03 23:21:52 +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
42031be1ef Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264 am: 8b8c7eb442
am: 24801a3438

Change-Id: If9ac0b97eee7a1df3e87c9d97f17d182021a0d9f
2017-10-02 21:12:20 +00:00
Tao Bao
24801a3438 Merge "roots: Fix an issue with volume_for_path()." am: dd7a4b5264
am: 8b8c7eb442

Change-Id: Ia87f2388e47fa083a5e9e1e4d49d3021d808cb2b
2017-10-02 21:10:20 +00: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
Chih-Hung Hsieh
4cf96b1632 Merge "Use -Werror in bootable/recovery" am: 88aa128e22 am: b5437e3e1b
am: e4be0899b2

Change-Id: Ib492fc1163288752d3ceb45569aa7a9f9c2aab6f
2017-10-02 20:54:05 +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
e4be0899b2 Merge "Use -Werror in bootable/recovery" am: 88aa128e22
am: b5437e3e1b

Change-Id: I4ce078f45cc91dc0e868611dd5913b375a029be7
2017-10-02 20:48:37 +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
845d91ca1a Merge "roots: Remove #include "common.h"." am: e8ee697364 am: 0fa08924c6
am: 61ec157f7d

Change-Id: Ib5691e5f1fff2466f99bf949e23cfbc48ef79b98
2017-10-02 18:06:25 +00:00
Tao Bao
61ec157f7d Merge "roots: Remove #include "common.h"." am: e8ee697364
am: 0fa08924c6

Change-Id: Ifc86ba18e9cbc69937e17a5434b076a34db27093
2017-10-02 17:58:24 +00: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
Tao Bao
a2ecd59978 Merge "otafault: Move to soong." am: 475794a9af am: 2812e5d16b
am: 3af1827bb5

Change-Id: I0a2eb534dafda090b2a98547e75030dcbfbc50e8
2017-09-30 01:14:15 +00:00
Tao Bao
5ae5a477b3 Merge "otafault: Move headers under otafault/." am: 4289deaf82 am: 0018b93b27
am: 540c16307a

Change-Id: I2cc0e38c036220452dbe92622f009bd7dbea406f
2017-09-30 01:13:53 +00:00
Tianjie Xu
a9d8f3f0f4 Merge "Move the png open and destroy functions into a class" am: e687c5a1e1 am: 297a994416
am: 408ee90b58

Change-Id: Ic12c64792fca35d0ddb017a4016e3a17fa90a09d
2017-09-30 01:11:47 +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