Android Build Merger (Role)
50abbfdb53
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
am: 83c448128c
...
Change-Id: I2bd8d8265cf136682fa5faba753979ad6ff2dda8
2018-02-12 19:29:17 +00:00
Android Build Merger (Role)
83c448128c
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
skipped: ac14372129
...
Change-Id: I47eefa3ba40b22e9f03a510bb6f03b04f0d18aef
2018-02-12 19:29:13 +00:00
Android Build Merger (Role)
ac14372129
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
am: 70ea788dfa
...
Change-Id: Ia9c78b05a58e5dddd2e90a6bf53b638ddbccecf1
2018-02-12 19:29:10 +00:00
Android Build Merger (Role)
70ea788dfa
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
am: 83709d3152
...
Change-Id: I970dd7c49833638b34d415ee962b60a13d382c0c
2018-02-12 19:29:07 +00:00
Android Build Merger (Role)
83709d3152
[automerger] [DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev Bug:73240847 am: e4d86d9b06
...
Change-Id: I8dd3706df6cb68d4e7c7dc47bb218e3bc0e5afec
2018-02-12 19:29:03 +00:00
Adam Seaton
e4d86d9b06
[DO NOT MERGE] Update Security String to 2018-04-01 on mnc-dev
...
Bug:73240847
2018-02-12 11:27:35 -08:00
Android Build Merger (Role)
6f3e62e7e5
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
skipped: 8501efda49
skipped: 14f5e7822e
skipped: a827c465de
skipped: skipped: c73989b3fc
...
Change-Id: Ifac35ecdc96dd67b1e49a3fd361f0a8a0bbac0c1
2018-02-12 19:18:10 +00:00
Android Build Merger (Role)
c73989b3fc
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
skipped: 8501efda49
skipped: 14f5e7822e
skipped: a827c465de
skipped: 7dbf8e1467
...
Change-Id: Ia58c9ebde3649fad5426a7d4d7b2205feaefce70
2018-02-12 19:18:07 +00:00
Android Build Merger (Role)
7dbf8e1467
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
skipped: 8501efda49
skipped: 14f5e7822e
skipped: a827c465de
...
Change-Id: Idc0e7091761d0d20743725bc0bd7738e7ab46960
2018-02-12 19:18:04 +00:00
Android Build Merger (Role)
a827c465de
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
skipped: 8501efda49
skipped: 14f5e7822e
...
Change-Id: Ib27162e4084213ff9b19a647b4c9cf0ab693dd40
2018-02-12 19:18:00 +00:00
Android Build Merger (Role)
14f5e7822e
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
skipped: 8501efda49
...
Change-Id: Ia1823874bf668652495bdde1f9142ef50f0519fd
2018-02-12 19:17:57 +00:00
Android Build Merger (Role)
8501efda49
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
skipped: dd276ca966
...
Change-Id: I946b3f1523f613c3a5e8008ccac78cd7672184ce
2018-02-12 19:17:52 +00:00
Android Build Merger (Role)
dd276ca966
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
skipped: ccd891285c
...
Change-Id: I8a60ed0ab627fb6dda498e7d2f9993769651c5e3
2018-02-12 19:17:48 +00:00
Android Build Merger (Role)
ccd891285c
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
skipped: df3319a7fb
...
Change-Id: I47bb8aef3b52eaaf5c99b4d28dc127c5a3970490
2018-02-12 19:17:45 +00:00
Android Build Merger (Role)
df3319a7fb
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
skipped: ab40f0170c
...
Change-Id: If919c336906d3b426e4f57551271ccea457d333b
2018-02-12 19:17:42 +00:00
Android Build Merger (Role)
ab40f0170c
[automerger skipped] [DO NOT MERGE] Update Security String to 2018-04-01 Bug: 73240847 skipped: 5b07fbe498
...
Change-Id: Id14db714c9b92ff497ba7021118cc0a501db33c9
2018-02-12 19:17:38 +00:00
Android Build Merger (Role)
2f8c1187fa
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
skipped: 9108464768
skipped: e621f5b6b1
skipped: affcc08a8e
skipped: skipped: aa694967c6
...
Change-Id: I105ef470f53e5296f373678f6669c8abf9ffd293
2018-02-12 19:15:41 +00:00
Android Build Merger (Role)
aa694967c6
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
skipped: 9108464768
skipped: e621f5b6b1
skipped: affcc08a8e
skipped: 01433de204
...
Change-Id: I20cb7e7fd4bf6713988df2224412fd0c003862dc
2018-02-12 19:15:38 +00:00
Android Build Merger (Role)
01433de204
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
skipped: 9108464768
skipped: e621f5b6b1
skipped: affcc08a8e
...
Change-Id: I11908ba2f37a6fc5ab4a4d0491094513dfa90228
2018-02-12 19:15:35 +00:00
Android Build Merger (Role)
affcc08a8e
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
skipped: 9108464768
skipped: e621f5b6b1
...
Change-Id: Ie690734a8144dc500ea8bbe297618e5368f48fbb
2018-02-12 19:15:32 +00:00
Android Build Merger (Role)
e621f5b6b1
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
skipped: 9108464768
...
Change-Id: Id935910b2c5fc6ecd9d53ea75cbf5e9307b81452
2018-02-12 19:15:28 +00:00
Android Build Merger (Role)
9108464768
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
skipped: a359a0a255
...
Change-Id: Id91b8e4bf24a9627392e7cf5e26415706c7f343e
2018-02-12 19:15:25 +00:00
Android Build Merger (Role)
a359a0a255
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
skipped: b384901f8e
...
Change-Id: Ibd4f622162fd6a8cf1f0399e4a8f722e525bd8d2
2018-02-12 19:15:22 +00:00
Android Build Merger (Role)
b384901f8e
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
skipped: 6dc142b573
...
Change-Id: Ic640071f2f87944fc64772e8a5ef686cd09a1f35
2018-02-12 19:15:19 +00:00
Android Build Merger (Role)
6dc142b573
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
skipped: a80adf5681
...
Change-Id: Ib108c0d99a369ef98e89a06124d5f811c9dd1c62
2018-02-12 19:15:16 +00:00
Android Build Merger (Role)
a80adf5681
[automerger skipped] [DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01 Bug:71860241 skipped: 014165cb84
...
Change-Id: I12ddd6c70fba413b84014875f1a9cad09f5868ba
2018-02-12 19:15:12 +00:00
Adam Seaton
5b07fbe498
[DO NOT MERGE] Update Security String to 2018-04-01
...
Bug: 73240847
2018-02-12 11:11:07 -08:00
Adam Seaton
014165cb84
[DO NOT MERGE] Update LMP-MR1-Release to 2018-03-01
...
Bug:71860241
2018-02-12 11:09:13 -08:00
Tao Bao
7eb2afb226
Merge "releasetools: Add an ImgdiffStats class that reports imgdiff stats."
2018-02-12 19:01:24 +00:00
Tom Cherry
c2ab6232d9
Merge "Place TARGET_FS_CONFIG_GEN passwd/group files in /vendor/etc" am: 3d9fa3615d
...
am: 57dd54f623
Change-Id: Ica4d341247fc0f770ccdfafd165df05d70f39772
2018-02-12 16:38:43 +00:00
Tom Cherry
57dd54f623
Merge "Place TARGET_FS_CONFIG_GEN passwd/group files in /vendor/etc"
...
am: 3d9fa3615d
Change-Id: I418fa2dd55aadcbb4eb013c83559ac02a0a29f22
2018-02-12 16:33:01 +00:00
Tom Cherry
3d9fa3615d
Merge "Place TARGET_FS_CONFIG_GEN passwd/group files in /vendor/etc"
2018-02-12 16:27:20 +00:00
Tao Bao
667ff57272
releasetools: Specify SWITCH_SLOT_ON_REBOOT for secondary payload.
...
The secondary payload should always be applied with
SWITCH_SLOT_ON_REBOOT=0. This CL moves the 'secondary' parameter from
Payload.WriteToZip() to Payload.__init__(). So it can append the flag to
secondary/payload_properties.txt.
Bug: 35724498
Test: Generate an A/B OTA with --include_secondary. Check
secondary/payload_properties.txt entry in the generated ZIP.
Test: `python -m unittest test_ota_from_target_files`
Change-Id: I816c07ab57a1c8a52eff785801634b8b1cb134d4
2018-02-10 00:13:07 -08:00
Tao Bao
294651d7b4
releasetools: Add an ImgdiffStats class that reports imgdiff stats.
...
We have a couple of active imgdiff workarounds (and likely with one more
inbounding that allows having shared blocks in ext4 image). Most of
these workarounds need extending imgdiff's capability. While us not
getting there anytime soon, collect the stats to better understand the
impact of each kind so we can prioritize accordingly.
A sample report is as follows.
Imgdiff Stats Report
========================
APK files diff'd with imgdiff (count: 88)
-------------------------------------------
/system/priv-app/Shell/Shell.apk
...
Large APK files split and diff'd with imgdiff (count: 4)
----------------------------------------------------------
/system/priv-app/Settings/Settings.apk
...
Bug: 68016761
Test: Generate an incremental BBOTA package. Check the stats report.
Test: python -m unittest test_blockimgdiff
Change-Id: I27ad862cde472ab2806db877632ce5a0607420f2
2018-02-09 23:02:32 -08:00
Tao Bao
194e49e06c
Merge "releasetools: Refactor the condition checking for using imgdiff." am: bec8be51a5
...
am: 4a79eb0d4e
Change-Id: Ia050150657bb373e92bf9797764ef987493e9c96
2018-02-10 02:16:54 +00:00
Tao Bao
4a79eb0d4e
Merge "releasetools: Refactor the condition checking for using imgdiff."
...
am: bec8be51a5
Change-Id: I4cabec977a8a6d963c707d95dff398be2aff3140
2018-02-10 02:00:38 +00:00
Tao Bao
bec8be51a5
Merge "releasetools: Refactor the condition checking for using imgdiff."
2018-02-10 00:47:42 +00:00
Dan Willemsen
4cdbaf1186
Revert "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""
...
This reverts commit 30d6869faf
.
Fixes an issue with the original change where proguard files without
newlines at the end of the file would get merged with the next file.
Most of the time the next file started with a comment, which worked
fine, but sometimes it was a syntax error.
Bug: 72969557
Test: m
Test: build on an internal tree that failed last time
Change-Id: I66f13ae80ee0f96b456e526bfbfc2cdcf82c3f3a
2018-02-09 15:22:52 -08:00
Chenbo Feng
2b948a2259
Add bpfloader binary to system image
...
The bpfloader is a executable binary used by netd to load and attach
networking related bpf program at run time. It need to be flashed to
device when updating the system image. Currently this binary is only
used by devices with kernel version 4.9 or above.
Test: hikey boot and bpf program show up under sys/fs/bpf
Bug: 30950746
Change-Id: I3d14d270a04ea57319ad4292ff51b1cf933fc975
2018-02-09 15:17:22 -08:00
Tao Bao
cb73aed1f0
releasetools: Refactor the condition checking for using imgdiff.
...
In Transfer class, unbundle 'intact' with the monotonicity of the input
ranges. Negate the logic of 'intact', and thus rename it to 'trimmed'.
Move this property from an attribute of Transfer class as the one in
RangeSet.extra. 'trimmed' indicates whether the source / target ranges
have been modified after creating the Transfer() instance.
The logic that determines whether we can apply imgdiff has been
refactored and consolidated into BlockImageDiff.CanUseImgdiff(). Now
both of the two paths call this single copy, i.e. the one that detects
large APKs (before creating Transfer()'s), and the other that's about to
generate the patch for a given Transfer instance.
Bug: 68016761
Test: python -m unittest test_blockimgdiff
Test: Generate an incremental BBOTA package.
Change-Id: Id07195f63f1fa6c3af6e9091940d251cf09fa104
2018-02-09 12:46:01 -08:00
Dan Willemsen
ea121f2a9a
Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"" am: 2744cbf190
...
am: 22eb731606
Change-Id: Ibfa7d19f060c28bf3f44ca284275f2d6c7c7e904
2018-02-09 19:44:15 +00:00
Dan Willemsen
22eb731606
Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""
...
am: 2744cbf190
Change-Id: I276e0f9be16d88d4c39d1c4a5dd177cf5aae9f32
2018-02-09 19:38:38 +00:00
Dan Willemsen
2744cbf190
Merge "Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES""
2018-02-09 19:22:13 +00:00
Dan Willemsen
30d6869faf
Revert "Propagate proguard rules from LOCAL_STATIC_ANDROID_LIBRARIES"
...
This reverts commit df5d7da7d8
.
Reason for revert: breaking builds
Bug: 72969557
Change-Id: I27aad65587933c3f760a89c541d27469c916abe8
2018-02-09 19:21:11 +00:00
Tom Cherry
af0a12eded
Merge "Add compile time check that friendly AID names are < 32 characters" am: 9f25d873bf
...
am: cfac68eb9c
Change-Id: I52c488b8fc0b6e42ef379b517cc816fc8e759738
2018-02-09 19:00:04 +00:00
Tom Cherry
cfac68eb9c
Merge "Add compile time check that friendly AID names are < 32 characters"
...
am: 9f25d873bf
Change-Id: Iace2d0294a7ca5318d568614b021a13713a72a78
2018-02-09 18:53:56 +00:00
Tom Cherry
9f25d873bf
Merge "Add compile time check that friendly AID names are < 32 characters"
2018-02-09 18:46:27 +00:00
Tom Cherry
ee0610e86c
Add compile time check that friendly AID names are < 32 characters
...
There is an internal buffer in bionic for user/group names that is 32
characters long including the trailing null, so we must restrict the
length of these names during compile time.
Bug: 27999086
Test: Successfully compile a valid config.fs
Test: Fail to compile a config.fs with AID name > 31 characters
Change-Id: I7fe887c630dd4d1033b86a5d8332480eb3b0fa07
2018-02-09 18:46:13 +00:00
Tom Cherry
55d0104f1b
Place TARGET_FS_CONFIG_GEN passwd/group files in /vendor/etc
...
These entries are vendor provided and belong on the /vendor partition.
Bug: 27999086
Test: end to end user/group check via config.fs and getpwnam, etc.
Change-Id: I9a5d56da594bf0d04de2b9ce7fd7d9a8151d4682
2018-02-09 10:44:52 -08:00
Colin Cross
3c508d0b3d
Merge "Move to-upper and to-lower to definitions.mk" am: 74413198b7
...
am: 7209b4066b
Change-Id: If42879f1bca2c3f7ff34b57e2447ee2ce947cd70
2018-02-09 18:43:48 +00:00