Commit Graph

5698 Commits

Author SHA1 Message Date
Tao Bao d2a24050da Merge "Drop the no-op Android.bp." am: 242d41b808
am: 2d62142fff

Change-Id: I9b480f80355188f4904f5a907090e64d7cfa4a7d
2018-03-07 20:44:17 +00:00
Tao Bao 2d62142fff Merge "Drop the no-op Android.bp."
am: 242d41b808

Change-Id: Id6c89984548aa261c4063f2cd1e90c2bc66f2074
2018-03-07 20:37:47 +00:00
Treehugger Robot 242d41b808 Merge "Drop the no-op Android.bp." 2018-03-07 20:17:06 +00:00
Tao Bao 15bc28727a Merge "minadbd: Move to Soong." am: 56160b2b03
am: 734f76fc38

Change-Id: Ic7c86ba406ab051ddb0da32544290196e1d4d779
2018-03-07 19:18:19 +00:00
Tao Bao 734f76fc38 Merge "minadbd: Move to Soong."
am: 56160b2b03

Change-Id: I805ccc2c72bb1c391b4a72498283b911e826a547
2018-03-07 19:12:17 +00:00
Treehugger Robot 56160b2b03 Merge "minadbd: Move to Soong." 2018-03-07 18:56:50 +00:00
Tao Bao e8fdb1ab0b Drop the no-op Android.bp.
The "subdirs=" statement no longer has any effect (with the CL in [1]
that's merged last November). All the Android.bp's will be picked up
automatically.

[1] commit 4f21237342e715cbbac6e409cd67e86a304483c4 in
https://android-review.googlesource.com/c/platform/build/blueprint/+/530115.

Test: mmma -j bootable/recovery
Change-Id: Idd39af1fff907e8c1886f91eea0dd4a9e38a4079
2018-03-07 18:03:23 +00:00
Tao Bao 8c7761edec minadbd: Move to Soong.
Test: mmma -j bootable/recovery
Change-Id: Ic4cd676a842f0e8c4735cc6731fcbf13b844510c
2018-03-06 20:36:35 -08:00
Tianjie Xu 4249cdfe29 Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed am: a72f93d6da
am: 6c87845cfb

Change-Id: If8cf8b4f86ceae41d19ecbcf8e8fc62ef17eb2ac
2018-03-01 18:58:27 +00:00
Tianjie Xu 6c87845cfb Merge "Add a singleton CacheLocation to replace the hard coded locations" am: 47cd789eed
am: a72f93d6da

Change-Id: Ie505267652e83735f60e8acc93da22e2ac1abe69
2018-03-01 18:52:54 +00:00
Tianjie Xu a72f93d6da Merge "Add a singleton CacheLocation to replace the hard coded locations"
am: 47cd789eed

Change-Id: I11c265d3adebc338e0603ed00c7d1aaaffae0253
2018-03-01 18:45:52 +00:00
Tianjie Xu 47cd789eed Merge "Add a singleton CacheLocation to replace the hard coded locations" 2018-03-01 18:36:05 +00:00
Tianjie Xu 3bbb20f557 Add a singleton CacheLocation to replace the hard coded locations
This class allows us to set the following locations dynamically:
cache_temp_source, last_command_file, stash_directory_base.

In the updater's main function, we reset the values of these variables
to their default locations in /cache; while we can set them to temp
files in unit tests or host simulation.

Test: unit tests pass
Change-Id: I528652650caa41373617ab055d41b1f1a4ec0f87
2018-02-28 11:19:11 -08:00
Tianjie Xu bb928df6eb Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af am: 7b9a92c1e2
am: e0f7c39c4f

Change-Id: I33b49c01cfaa0e1ec8bfc7f92ffe5c7d034c3bf4
2018-02-28 19:11:05 +00:00
Tianjie Xu e0f7c39c4f Merge "Fix the behavior of undefined commands in BlockImageVerify" am: ac4818d6af
am: 7b9a92c1e2

Change-Id: I7891f4e907cc73618b99e2102eb8844771554b1f
2018-02-28 19:05:04 +00:00
Tianjie Xu 7b9a92c1e2 Merge "Fix the behavior of undefined commands in BlockImageVerify"
am: ac4818d6af

Change-Id: I5e42bcafca4c42e6c30cef082c03ad2b8d18ac6c
2018-02-28 18:59:33 +00:00
Tianjie Xu ac4818d6af Merge "Fix the behavior of undefined commands in BlockImageVerify" 2018-02-28 18:49:56 +00:00
Tianjie Xu c242084539 Fix the behavior of undefined commands in BlockImageVerify
In BlockImageVerify some commands are undefined, e.g. "erase", "new",
"zero". And we should not error out if the corresponding function
pointer of these commands is null; otherwise we will fail the
verification.

The old code is:
if (cmd->f != nullptr && cmd->f(params) == -1)
  return false;

In the last_command_file change the logic was wrongly modified to
if (cmd->f == nullptr)
  return false;
...
if (cmd->f(params) == -1)
  return false;

Test: sideload an incremental OTA twice on bullhead
Change-Id: I2561c365badb850da0e416629ccd61f0df7da5d7
2018-02-27 23:04:14 -08:00
Tianjie Xu 133d1d25d7 Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7 am: a306d7bc55
am: 98da1357b4

Change-Id: Ieb024183866d702c72a3c1d3a4636500ebfc0b0a
2018-02-23 21:55:58 +00:00
Tianjie Xu 98da1357b4 Merge "Remove the assumption of target chunk size in imgdiff" am: cc3446a7f7
am: a306d7bc55

Change-Id: Ieb2fe6cf9f8bf71a5018809f16510c4ef05420d4
2018-02-23 21:43:14 +00:00
Tianjie Xu a306d7bc55 Merge "Remove the assumption of target chunk size in imgdiff"
am: cc3446a7f7

Change-Id: Ic5d50e6c54dfd352950925d01448020669735056
2018-02-23 21:31:09 +00:00
Treehugger Robot cc3446a7f7 Merge "Remove the assumption of target chunk size in imgdiff" 2018-02-23 21:12:39 +00:00
Tianjie Xu 572abbb81c Remove the assumption of target chunk size in imgdiff
In the split mode of imgdiff, we used to assume that the size of a split
target chunk is always greater than the blocksize i.e. 4096. This may
lead to the following assertion failure:
I0221 04:57:33.451323 818464 common.py:205 imgdiff F 02-21 04:57:33 821203 821203 imgdiff.cpp:999]
Check failed: tgt_size >= BLOCK_SIZE (tgt_size=476, BLOCK_SIZE=4096)

This CL removes the assumption and handles the edge cases.

Test: generate and verify the incremental update for TFs in the bug; unit test passes

Bug: 73757557
Bug: 73711365
Change-Id: Iadbb4ee658995f5856cd488f3793980881a59620
2018-02-23 10:44:05 -08:00
George Burgess IV a362703826 Merge "Replace vfork() with fork()." am: 21b381622d am: 44f2cb2d67
am: c298833b1c

Change-Id: Ia72697181a9132713b216b6f7c0b7116e09d62fd
2018-02-23 17:47:22 +00:00
George Burgess IV c298833b1c Merge "Replace vfork() with fork()." am: 21b381622d
am: 44f2cb2d67

Change-Id: Ie67e2e0a39c781e27916294f501fcc4ef8fbd38f
2018-02-23 17:31:08 +00:00
George Burgess IV 44f2cb2d67 Merge "Replace vfork() with fork()."
am: 21b381622d

Change-Id: Ia06201cedfcca6358f6f65face5325a4cf528f72
2018-02-23 17:24:51 +00:00
Treehugger Robot 21b381622d Merge "Replace vfork() with fork()." 2018-02-23 17:04:34 +00:00
George Burgess IV 1cfb361129 Replace vfork() with fork().
The static analyzer complained about the function calls we were doing
here to vector::data() and vector::operator[]:
bootable/recovery/roots.cpp:193:11: warning: This function call is
prohibited after a successful vfork

Since it's not clear that vfork() is needed here, just use fork()
instead.

Bug: None
Test: Reran the static analyzer with only this patch applied. Bug
disappeared
Change-Id: I580f8243a21899f1e1678c8aee6948dfa7f69a1d
2018-02-22 19:25:22 -08:00
Bill Yi 0bfea531d8 Import translations. DO NOT MERGE
Change-Id: I60c4e4ebce0bf3abcc2b0b5ab90b0fc5e9406c34
Auto-generated-cl: translation import
2018-02-21 17:03:26 -08:00
hansson a7df318913 Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b am: cd06b1696d
am: b1ac1b8494

Change-Id: Id51803759530a630ecfb287126c5e366938ad09f
2018-02-21 17:47:02 +00:00
hansson b1ac1b8494 Merge "Set LOCAL_SDK_VERSION where possible." am: bf52b7e00b
am: cd06b1696d

Change-Id: I78bbe2e58b6d7d442984d3533dedbae705cb156f
2018-02-21 17:37:58 +00:00
hansson cd06b1696d Merge "Set LOCAL_SDK_VERSION where possible."
am: bf52b7e00b

Change-Id: I91a73e01b2a9b13923a551957da98a2eb9363dc9
2018-02-21 17:31:10 +00:00
hansson bf52b7e00b Merge "Set LOCAL_SDK_VERSION where possible." 2018-02-21 17:20:44 +00:00
Anton Hansson 6cc499ae07 Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.

Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.

Test: make relevant packages
Bug: 73535841
Change-Id: I82fee834c5d92e699e9571933faded11c6d4596e
2018-02-21 14:11:02 +00:00
Tianjie Xu 0d4a75abf0 Merge "Disable building libapplypatch on mac" am: c1e1d7e711 am: 2754916f01
am: bda2f67775

Change-Id: I378aa4bb2a7d5cd7765feb0fc99f92f1b51a377b
2018-02-18 08:45:43 +00:00
Tianjie Xu bda2f67775 Merge "Disable building libapplypatch on mac" am: c1e1d7e711
am: 2754916f01

Change-Id: Ibfb57ca66bb826b2710db4572a2d3d730a7db0e5
2018-02-18 08:35:39 +00:00
Tianjie Xu 2754916f01 Merge "Disable building libapplypatch on mac"
am: c1e1d7e711

Change-Id: I333af93c0dc7cf8b2a175f6c42c5321f442bd115
2018-02-18 08:24:05 +00:00
Treehugger Robot c1e1d7e711 Merge "Disable building libapplypatch on mac" 2018-02-18 08:15:13 +00:00
Tianjie Xu 7a4dacf724 Disable building libapplypatch on mac
The sdk_mac on build server fails with the error:
bootable/recovery/applypatch/freecache.cpp:23:10: fatal error: 'sys/statfs.h' file not found

So we will disable libapplypatch on mac.

Test: the library still builds on linux; and check the other host targets in the same cl.
Change-Id: Ie4a30708726e51c810f7ad7f1085d38154076cca
2018-02-17 22:06:31 -08:00
Tianjie Xu 7920648ebb Merge "Skip the cache size check on host" am: 31bcd7c002 am: fb8496e3aa
am: 021d8fe0a3

Change-Id: I6414283e319e124595ef2b8be1428f7952c8fdeb
2018-02-17 00:45:45 +00:00
Tianjie Xu 021d8fe0a3 Merge "Skip the cache size check on host" am: 31bcd7c002
am: fb8496e3aa

Change-Id: If57297252bfe3ccf9c45028747a8fa8760052c48
2018-02-17 00:36:42 +00:00
Tianjie Xu fb8496e3aa Merge "Skip the cache size check on host"
am: 31bcd7c002

Change-Id: If265166022cc36142e4cc6061f1165e9814e9482
2018-02-17 00:29:07 +00:00
Tianjie Xu 31bcd7c002 Merge "Skip the cache size check on host" 2018-02-17 00:15:19 +00:00
Tao Bao 1efbdc25a2 Merge "recovery: Porting screensave mode for new platform." am: 15e376d792 am: 470b4fef7f
am: 78997a2af5

Change-Id: Ife60145d34a88c8e474931966f456804e39a317c
2018-02-16 05:28:56 +00:00
Tao Bao 78997a2af5 Merge "recovery: Porting screensave mode for new platform." am: 15e376d792
am: 470b4fef7f

Change-Id: I30b84b2cd5071842493f5900a3485cd4f5bc9769
2018-02-16 05:21:53 +00:00
Tao Bao 470b4fef7f Merge "recovery: Porting screensave mode for new platform."
am: 15e376d792

Change-Id: I2537ea9b3b4a5560c79226450fcf236ec0935e9e
2018-02-16 05:15:40 +00:00
Tao Bao 15e376d792 Merge "recovery: Porting screensave mode for new platform." 2018-02-16 05:07:57 +00:00
Tianjie Xu 974a6e80c6 Merge "Reorder the functions in updater/install.cpp" am: 9818283da7 am: 576d2754ee
am: f6cd6b9e85

Change-Id: If9af6bf5fd3cd21e8efcf02fbf6c036ece882713
2018-02-13 07:06:06 +00:00
Tianjie Xu f6cd6b9e85 Merge "Reorder the functions in updater/install.cpp" am: 9818283da7
am: 576d2754ee

Change-Id: Iafbe590ed553d3be8b3875b797aeffc88ae67605
2018-02-13 06:56:58 +00:00
Tianjie Xu 576d2754ee Merge "Reorder the functions in updater/install.cpp"
am: 9818283da7

Change-Id: I3451ff1641495a7a676d5ea3bea81ce38815fc2f
2018-02-13 06:48:24 +00:00