Commit Graph

43356 Commits

Author SHA1 Message Date
Chenbo Feng 53e5a438a8 Merge "Add bpfloader binary to system image" am: 5502f9958a am: 5880e5d7b6
am: 5443668bb0

Change-Id: Ia0112717e4a9dc55ae644f92fe071b9cbb18d2c7
2018-02-13 07:11:57 +00:00
Chenbo Feng 5443668bb0 Merge "Add bpfloader binary to system image" am: 5502f9958a
am: 5880e5d7b6

Change-Id: I0d28c3e36609f35cc187de50cb154095081d555e
2018-02-13 06:59:42 +00:00
Chenbo Feng 5880e5d7b6 Merge "Add bpfloader binary to system image"
am: 5502f9958a

Change-Id: Ifc233acb41850afb588d84551a8c30466fa9c4c6
2018-02-13 06:49:34 +00:00
Treehugger Robot 5502f9958a Merge "Add bpfloader binary to system image" 2018-02-13 05:49:46 +00:00
Christopher Ferris 8c70d4de97 Add libc_malloc_hook to list of libraries.
Bug: 30561479

Test: Build from scratch and verify the library is present.
Change-Id: I53f30d694cff202ffc93491485ed3c845de07862
2018-02-13 04:09:44 +00:00
bowen_lai 4570fdbb4c Create symbolic boot vdex files for different ISAs
Create only one vdex file and share between different ISAs.
By sharing vdex file, zygote32 and zygote64 can share the same file and
the system partition size is reduced by about 32MB.

Test: make framework & check boot.vdex and boot-*.vdex files
Test: test system boots with no selinux violations

Bug: 64211239

Change-Id: I31ede4b6aa342f2047d9309b8c631217e6699202
2018-02-12 19:45:21 -08:00
Adam Seaton a9d30a23d3 Update Security String in Master to 2018-04-05
Bug:73240847
2018-02-12 13:13:41 -08:00
Tao Bao 508b087943 releasetools: Make blockimgdiff.py pylint-clean.
************* Module blockimgdiff
C:433, 0: Unnecessary parens after 'if' keyword (superfluous-parens)
C:687, 0: Wrong hanging indentation (add 4 spaces).
            max_stashed_blocks, self._max_stashed_size, max_allowed,
            ^   | (bad-continuation)
C:688, 0: Wrong hanging indentation (add 4 spaces).
            self._max_stashed_size * 100.0 / max_allowed))
            ^   | (bad-continuation)
C:691, 0: Wrong hanging indentation (remove 2 spaces).
            max_stashed_blocks, self._max_stashed_size))
          | ^ (bad-continuation)
C:898, 0: Wrong hanging indentation (add 4 spaces).
                  "imgdiff" if imgdiff else "bsdiff",
                  ^   | (bad-continuation)
C:899, 0: Wrong hanging indentation (add 4 spaces).
                  xf.tgt_name if xf.tgt_name == xf.src_name else
                  ^   | (bad-continuation)
C:901, 0: Wrong hanging indentation (add 4 spaces).
                  xf.tgt_ranges, xf.src_ranges, e.message))
                  ^   | (bad-continuation)
C:909, 0: Wrong hanging indentation (add 4 spaces).
                      xf.tgt_name,))
                      ^   | (bad-continuation)
C:917, 0: Wrong hanging indentation (add 4 spaces).
                      xf.tgt_name, e.message))
                      ^   | (bad-continuation)
C:961, 0: Wrong hanging indentation (remove 2 spaces).
                xf.patch_len, tgt_size, xf.patch_len * 100.0 / tgt_size,
              | ^ (bad-continuation)
C:962, 0: Wrong hanging indentation (remove 2 spaces).
                xf.style,
              | ^ (bad-continuation)
C:963, 0: Wrong hanging indentation (remove 2 spaces).
                xf.tgt_name if xf.tgt_name == xf.src_name else (
              | ^ (bad-continuation)
C:965, 0: Wrong hanging indentation (remove 2 spaces).
                xf.tgt_ranges, xf.src_ranges))
              | ^ (bad-continuation)
C:1422, 0: Wrong continued indentation (add 28 spaces).
                tgt_skipped.size() * 100.0 / tgt_size, tgt_name))
                ^                           | (bad-continuation)
C:1560, 0: Wrong continued indentation (add 8 spaces).
            split_src_ranges) in enumerate(split_info_list):
            ^       | (bad-continuation)
R:566, 6: Redefinition of src_str type from list to str (redefined-variable-type)
C:1198,25: More than one statement on a single line (multiple-statements)
C:1211,25: More than one statement on a single line (multiple-statements)
C:1220,16: More than one statement on a single line (multiple-statements)
C:1277,38: More than one statement on a single line (multiple-statements)
C:1284,19: More than one statement on a single line (multiple-statements)
C: 19, 0: standard import "import copy" comes before "import common" (wrong-import-order)
C: 20, 0: standard import "import functools" comes before "import common" (wrong-import-order)
C: 21, 0: standard import "import heapq" comes before "import common" (wrong-import-order)
C: 22, 0: standard import "import itertools" comes before "import common" (wrong-import-order)
C: 23, 0: standard import "import multiprocessing" comes before "import common" (wrong-import-order)
C: 24, 0: standard import "import os" comes before "import common" (wrong-import-order)
C: 25, 0: standard import "import os.path" comes before "import common" (wrong-import-order)
C: 26, 0: standard import "import re" comes before "import common" (wrong-import-order)
C: 27, 0: standard import "import subprocess" comes before "import common" (wrong-import-order)
C: 28, 0: standard import "import sys" comes before "import common" (wrong-import-order)
C: 29, 0: standard import "import threading" comes before "import common" (wrong-import-order)
C: 31, 0: standard import "from collections import deque, OrderedDict" comes before "import common" (wrong-import-order)
C: 32, 0: standard import "from hashlib import sha1" comes before "import common" (wrong-import-order)

Test: `pylint --rcfile=pylintrc blockimgdiff.py`
Test: Generate an incremental BBOTA package.
Change-Id: Ia7ecd0e1fa48daf4e43251bdcdfcd08fb316015d
2018-02-12 13:01:34 -08:00
Tao Bao 9739514769 releasetools: Remove the global diff_done in blockimgdiff.py.
pylint complains about undefined `diff_done`:

W:754, 8: Global variable 'diff_done' undefined at the module level (global-variable-undefined)
W:820,14: Global variable 'diff_done' undefined at the module level (global-variable-undefined)

It would still warn about using global statement after adding the
definition.

W:859, 8: Using the global statement (global-statement)
W:925,14: Using the global statement (global-statement)

This CL computes 'diff_done' via 'len(diff_queue)' instead. It also
moves the progress reporting _before_ the diff work. This way it avoids
showing 100% progress with still changing filenames (because multiple
workers could see an empty queue simultaneously upon finishing their own
works).

There're possible alternatives, such as using the 'nonlocal' keyword in
Python 3 (which we're not there yet), or by using mutable object instead
(e.g. 'diff_done = [0]'). This CL looks cleaner, since it just kills the
var.

Test: Generate a BBOTA incremental. Check the on-screen progress
      report.
Test: `pylint --rcfile=pylintrc blockimgdiff.py` no longer complains
      about the global diff_done.
Change-Id: I339824735527e1f794b5b1dc99ff3fdb2da85744
2018-02-12 12:55:25 -08:00
Tao Bao a3ee598230 Merge "releasetools: Add an ImgdiffStats class that reports imgdiff stats." am: 7eb2afb226 am: 0ced5030d8
am: e6188063f1

Change-Id: I34118e0e88042ef8477a071f6819483746b0038c
2018-02-12 20:48:54 +00:00
Tao Bao e6188063f1 Merge "releasetools: Add an ImgdiffStats class that reports imgdiff stats." am: 7eb2afb226
am: 0ced5030d8

Change-Id: I120d8d268fc4a5e1230e16d9b9ab85b2bef20193
2018-02-12 20:28:11 +00:00
Tao Bao 0ced5030d8 Merge "releasetools: Add an ImgdiffStats class that reports imgdiff stats."
am: 7eb2afb226

Change-Id: I9d87494c9a3e8784128f152b5f16bf67865bdd30
2018-02-12 20:14:37 +00:00
Android Build Merger (Role) 2f29431ff1 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d skipped: 6206e9c2c4
Change-Id: I961e46ab627fee8e5e7903c9a450290e9d46f512
2018-02-12 19:50:06 +00:00
Android Build Merger (Role) 6206e9c2c4 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784 am: 82043e682d
Change-Id: Ia2faa5f1d7a1ba430061c06b03df6963a31f2bbf
2018-02-12 19:50:02 +00:00
Android Build Merger (Role) 82043e682d [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2 am: 9a781cc784
Change-Id: Iae6372d78a915688f577eb37c8294ea6b0c14a76
2018-02-12 19:50:00 +00:00
Android Build Merger (Role) 9a781cc784 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd am: e5018177a2
Change-Id: I28ba8487cfb46b4887d42baaf8d14ada2b258d0c
2018-02-12 19:49:57 +00:00
Android Build Merger (Role) e5018177a2 [automerger] [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev Bug: 73240847 am: b20e43bfbd
Change-Id: I9ace6376f11131672f1f900a60d5737e4a74bc21
2018-02-12 19:49:42 +00:00
Adam Seaton b20e43bfbd [DO NOT MERGE] Update security string to 2018-04-01 in nyc-dev
Bug: 73240847
2018-02-12 11:48:08 -08:00
Android Build Merger (Role) b0aa7c342a [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 am: 50abbfdb53 am: 00a67ddab1 am: 2afc690751 skipped: 49f77737a2
Change-Id: I45b510b29678883a6d89fd63960df9df4c84f9f5
2018-02-12 19:29:30 +00:00
Android Build Merger (Role) 49f77737a2 [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 am: 50abbfdb53 am: 00a67ddab1 am: 2afc690751
Change-Id: I41804bc2f8485c6b89708a3a7e82cb8f49fd37be
2018-02-12 19:29:27 +00:00
Android Build Merger (Role) 2afc690751 [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 am: 50abbfdb53 am: 00a67ddab1
Change-Id: I5bda5bccef672c7e713545801701481163d81734
2018-02-12 19:29:23 +00:00
Android Build Merger (Role) 00a67ddab1 [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 am: 50abbfdb53
Change-Id: I3afc37971e979b561cd4ead55a7f04d456526600
2018-02-12 19:29:20 +00:00
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