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
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
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
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
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
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
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
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
3af1827bb5
Merge "otafault: Move to soong." am: 475794a9af
...
am: 2812e5d16b
Change-Id: Ie5b169867b46fd269a3b2bb9e4a9f8f32aaea98a
2017-09-29 21:15:50 +00: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
540c16307a
Merge "otafault: Move headers under otafault/." am: 4289deaf82
...
am: 0018b93b27
Change-Id: I4b0c15c957e324e290826167ee073d7a75f5476f
2017-09-29 19:40:42 +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
408ee90b58
Merge "Move the png open and destroy functions into a class" am: e687c5a1e1
...
am: 297a994416
Change-Id: Ic33be526b2bae0533d42477dfb618579f9e97035
2017-09-29 17:42:39 +00: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
Tao Bao
d76a2e4c14
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES." am: 50f5a54a1e
...
am: 8277230a98
Change-Id: Iff51b6e020288a56a4e9705b9511a646a8eb999c
2017-09-29 17:16:01 +00:00
Tao Bao
8277230a98
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
...
am: 50f5a54a1e
Change-Id: I4f2d63757bb122cd027627321c1ab66c5e9284b6
2017-09-29 17:14:17 +00:00
Tao Bao
50f5a54a1e
Merge "otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES."
2017-09-29 17:08:01 +00:00
Tao Bao
f541841037
Merge "otafault: Clean up header inclusion." am: d9373cf621
...
am: ffc171c56d
Change-Id: Ib5d0676a143629c0151ad5e94052b67e2f626f49
2017-09-29 16:46:45 +00:00
Tao Bao
ffc171c56d
Merge "otafault: Clean up header inclusion."
...
am: d9373cf621
Change-Id: I1096e13532b7dbb6686479c8909a0252b31fc5f2
2017-09-29 16:37:32 +00:00
Tao Bao
d9373cf621
Merge "otafault: Clean up header inclusion."
2017-09-29 16:10:41 +00:00
Abhishek Arpure
5f9defe3f2
Merge "Integer overflow observed while formatting volume" am: 846f307c6f
...
am: 4a20e8b68f
Change-Id: Idbccd3323ddc9639094ed4c7f73ca6d4f917c9be
2017-09-29 05:34:15 +00:00
Abhishek Arpure
4a20e8b68f
Merge "Integer overflow observed while formatting volume"
...
am: 846f307c6f
Change-Id: I078b9079eb8f120780df2d38dabb663cef7a306b
2017-09-29 05:32:43 +00:00
Treehugger Robot
846f307c6f
Merge "Integer overflow observed while formatting volume"
2017-09-29 05:09:23 +00:00
Tao Bao
3421fa1815
Merge "roots: volume_for_path() parses and tries prefixes." am: 3a1587f655
...
am: fdbe272dc0
Change-Id: I344ef54db5949b853ad17a04ff88fd2254ac36bf
2017-09-29 04:41:55 +00:00
Tao Bao
646b05a66c
otafault: Remove the use of LOCAL_WHOLE_STATIC_LIBRARIES.
...
Commit d80a99883d has explanation of
potential issues.
Test: mmma bootable/recovery
Change-Id: I25ca9920952b7bbdd8a661d9dc90962431410bc4
2017-09-28 18:25:10 -07:00