Commit Graph

5041 Commits

Author SHA1 Message Date
Tao Bao
dfbe70b79d Merge "edify: Remove edify_parser."
am: 281d4eefb1

Change-Id: I821c8d191110be896b775a95a5d5ecb472c8cfe1
2017-10-04 15:59:04 +00: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
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
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
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
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
Tao Bao
ac27a7a987 otafault: Clean up header inclusion.
Remove unneeded #includes. Also remove unneeded dependency on libz and
libselinux.

Test: mmma bootable/recovery
Change-Id: Ic8f7f46f4b89762dee384921504489de75320ac0
2017-09-28 18:25:04 -07:00
Tao Bao
fdbe272dc0 Merge "roots: volume_for_path() parses and tries prefixes."
am: 3a1587f655

Change-Id: I8dbe9f7f1dca5e1f5d081854435f5ee069bab462
2017-09-28 23:05:35 +00:00
Tianjie Xu
acba38c288 Move the png open and destroy functions into a class
The open_png() function used to open the png file but didn't close it;
and this caused the leak of fd. However, we cannot close the file inside
open_png() because the png file needs to remain open until the outer
function finishes parsing the file and destroys the png struct.

This CL addresses this issue by implementing a PngReader class to handle
the creation/destruction of the png struct.

Bug: 67010912
Test: Run graphic tests; also run locale tests and check fd.
Change-Id: I9a803b3cd8c16f16a9ffe8f0acc7fe0f42e95eb0
2017-09-28 15:29:37 -07:00
Tao Bao
3a1587f655 Merge "roots: volume_for_path() parses and tries prefixes." 2017-09-28 21:12:53 +00:00
Tao Bao
2dfc1a3898 roots: volume_for_path() parses and tries prefixes.
Commit cc323958f99e40fea06c511656c69c0b2e2d47f7 in system/core has
changed fs_mgr_get_entry_for_mount_point() to do an exact match only,
which breaks the behavior in volume_for_path().

This CL changes the volume_for_path() implementation to parse and pass
prefixes locally. For a given path like "/cache/recovery/last_log", it
will in turn attempt the prefixes of "/cache/recovery/last_log",
"/cache/recovery", "/cache", "/" and return the first hit.

Bug: 63912287
Test: Build and boot into recovery image on bullhead. 'View recovery
      logs' works.
Change-Id: Ic8635b0939649dd5cc9ca501ebc3a2d1fbf5849d
2017-09-27 13:22:17 -07:00
Tianjie Xu
8874d3c309 Merge "Add a new option in recovery menu to test the background texts"
am: 4c7608f3ca

Change-Id: I58dde37fe5c07487956c255b2d588d8505820fe9
2017-09-27 17:45:01 +00:00
Tianjie Xu
4c7608f3ca Merge "Add a new option in recovery menu to test the background texts" 2017-09-27 17:39:05 +00:00
Tianjie Xu
29d5575fa8 Add a new option in recovery menu to test the background texts
Add a new option "Run locale test" to check the background text
images (i.e. texts for "erasing", "error", "no_command" and "installing"
with different locales.)

Use volume up/down button to cycle through all the locales embedded in
the png file, and power button to go back to recovery main menu.

Test: Run locale test with bullhead.
Change-Id: Ib16e119f372110cdb5e611ef497b0f9b9b418f51
2017-09-27 00:27:38 -07:00
Tao Bao
fccf3bc0cf Merge "clang-format: Remove the override of PenaltyExcessCharacter."
am: 151f0820ac

Change-Id: I6239cc5a76c39ae6f6e183000f4cab0573183be9
2017-09-27 01:01:34 +00:00
Tao Bao
151f0820ac Merge "clang-format: Remove the override of PenaltyExcessCharacter." 2017-09-27 00:57:55 +00:00
Tianjie Xu
eb5e194012 Merge "Output split information for imgdiff when handling large apks"
am: 7f54fe8841

Change-Id: I97ad82d84b16b46e9c0c0f8198d3ab73d43031b0
2017-09-27 00:02:43 +00:00
Tianjie Xu
7f54fe8841 Merge "Output split information for imgdiff when handling large apks" 2017-09-26 23:57:40 +00:00
Tao Bao
a1f6980af7 clang-format: Remove the override of PenaltyExcessCharacter.
So it falls back (from 32) to the default value in Google style:
PenaltyExcessCharacter: 1000000

This way it no longer allows lines exceeding the 100-char limit.

const char* x[] = { "long enough so that the line has 101 chars", nullptr };

  would become

const char* x[] = { "long enough so that the line has 101 chars",
                    nullptr };

Test: clang-format the line above.
Change-Id: If578dbdae55d6d81f5e47889890e2afa12b4199a
2017-09-26 15:07:45 -07:00
Tianjie Xu
6a5204ac8d Merge "update the recovery background image with new translation"
am: c0123e0c3a

Change-Id: I071133d52c92b7166df12313c7298621a6718eaa
2017-09-21 22:09:58 +00:00
Tianjie Xu
c0123e0c3a Merge "update the recovery background image with new translation" 2017-09-21 22:05:29 +00:00
Tianjie Xu
82582b4562 Output split information for imgdiff when handling large apks
Add a mandatory option in imgdiff to write the split info (i.e.
patch_size, tgt_size, src_ranges) to file when handling large apks.
Therefore, the caller of imgdiff can create split transfers based on
the info.

Bug: 63542719
Test: unit tests pass
Change-Id: I853d55d1f999fd576474faa81077f7307f4d856d
2017-09-21 11:42:16 -07:00
Tianjie Xu
4a47a3e41f update the recovery background image with new translation
Test: recovery manual test && run graphic test under recovery
Change-Id: I2bc514a07a12276f42adb1eec5e208190b4602f2
2017-09-19 23:36:28 -07:00