Commit Graph

43522 Commits

Author SHA1 Message Date
Tao Bao 5410d8a52a Merge "releasetools: Call Cleanup() in check_target_files_signatures.py."
am: 903be914bb

Change-Id: Idffcd2f42a0599384ac647d14c3c6b76cc9dd041
2018-03-02 22:51:28 +00:00
Treehugger Robot 903be914bb Merge "releasetools: Call Cleanup() in check_target_files_signatures.py." 2018-03-02 22:06:57 +00:00
Tao Bao a652c00c8e releasetools: Fix a mismatching close.
There's a mismatch in WriteABOTAPackageWithBrilloScript().

  temp_zip_file = tempfile.NamedTemporaryFile()
  ...
  common.ZipClose(temp_zip_file)

It's benign since common.ZipClose() happens to be calling
"temp_zip_file.close()". This CL moves the use of tempfile to
common.MakeTempFile(), so that the tempfile will be cleaned up
automatically as part of the call to common.Cleanup(). (Not fixing the
close() directly, since the nearby lines will be refactored into another
function shortly.)

Also remove one assert in the same function, which trivially holds in
the current code.

Test: Generate an A/B OTA.
Change-Id: I53b375d1150820de718dec0ead55abf5f4951071
2018-03-02 13:20:43 -08:00
Jayant Chowdhary dcf9ae8fb9 Merge "Collect all lsdump paths and write them to $(OUT_DIR)." am: 1fa15d7491 am: 210dc9010b
am: e47e3d302f

Change-Id: Ie745cfbbc1fa64fa59edd35f4e5454ab13a86b81
2018-03-02 18:08:54 +00:00
Jayant Chowdhary e47e3d302f Merge "Collect all lsdump paths and write them to $(OUT_DIR)." am: 1fa15d7491
am: 210dc9010b

Change-Id: Ib589fa0c952eaa0cdf762c7cc550e6ed9714203c
2018-03-02 18:02:48 +00:00
Jayant Chowdhary 210dc9010b Merge "Collect all lsdump paths and write them to $(OUT_DIR)."
am: 1fa15d7491

Change-Id: I695d0b6ab321e5e89832913fda51c4227f201f79
2018-03-02 17:51:09 +00:00
Jayant Chowdhary 1fa15d7491 Merge "Collect all lsdump paths and write them to $(OUT_DIR)." 2018-03-02 17:34:33 +00:00
Alan Viverette 7ca75e59a1 Merge "Move Support Library dependencies to their own var with resolution" 2018-03-02 15:08:15 +00:00
Tao Bao 150708b012 Merge "releasetools: Don't return ZipFile from common.UnzipTemp()." am: 5c93279fbe am: 0db979c6be
am: abe02acc48

Change-Id: Ie8d1d55d134a7aade1be643634641ef0eb80ff65
2018-03-01 22:44:21 +00:00
Tao Bao abe02acc48 Merge "releasetools: Don't return ZipFile from common.UnzipTemp()." am: 5c93279fbe
am: 0db979c6be

Change-Id: I9a4f2bc04851f048e168a11c039d781c2069b662
2018-03-01 22:38:46 +00:00
Tao Bao 0db979c6be Merge "releasetools: Don't return ZipFile from common.UnzipTemp()."
am: 5c93279fbe

Change-Id: Ibdfb0757aac08ed40ad53d0e5fab1d3385b3840b
2018-03-01 22:34:09 +00:00
Treehugger Robot 5c93279fbe Merge "releasetools: Don't return ZipFile from common.UnzipTemp()." 2018-03-01 22:21:25 +00:00
Andreas Gampe 216995134a Merge "Build: Add some dex2oat boot image error message" am: e706929161 am: 598f4c0fc3
am: 247b2309f7

Change-Id: I721de213797be877b9feb6f724d0c3eb01ffa66d
2018-03-01 21:13:23 +00:00
Andreas Gampe 247b2309f7 Merge "Build: Add some dex2oat boot image error message" am: e706929161
am: 598f4c0fc3

Change-Id: I4e626d87bb174ab68a1dbc3c704279b892b0aa84
2018-03-01 21:05:44 +00:00
Andreas Gampe 598f4c0fc3 Merge "Build: Add some dex2oat boot image error message"
am: e706929161

Change-Id: I2066802124e7252389e14c123c9aaea7273cdccf
2018-03-01 20:59:12 +00:00
Treehugger Robot e706929161 Merge "Build: Add some dex2oat boot image error message" 2018-03-01 20:46:05 +00:00
Andreas Gampe f47d9bf0e6 Merge "Build: Factor out ANDROID_LOG_TAGS" am: 16596052cb am: 8cb8255a60
am: 479c2fc9be

Change-Id: Ic6f042dc5f6e1fff1544e81c5e49a564ad2112e1
2018-03-01 20:12:11 +00:00
Andreas Gampe 479c2fc9be Merge "Build: Factor out ANDROID_LOG_TAGS" am: 16596052cb
am: 8cb8255a60

Change-Id: I4d0c428d01290dadd0a560cacaf43aa9cfbb750e
2018-03-01 20:05:29 +00:00
Andreas Gampe 8cb8255a60 Merge "Build: Factor out ANDROID_LOG_TAGS"
am: 16596052cb

Change-Id: I27e8cd5633f49cfe8cc00396e66aca104fe08968
2018-03-01 19:59:29 +00:00
Treehugger Robot 16596052cb Merge "Build: Factor out ANDROID_LOG_TAGS" 2018-03-01 19:50:05 +00:00
Tao Bao 767543a659 releasetools: Call Cleanup() in check_target_files_signatures.py.
Also minor cleanups to make it pylint clean.

Test: Run check_target_files_signatures.py with a target-files.zip.
Test: pylint --rcfile=pylintrc check_target_files_signatures.py
Change-Id: Ife3b54c7805c2f2562e87e91ab4b4de355782012
2018-03-01 10:12:39 -08:00
Tao Bao dba59eeabd releasetools: Don't return ZipFile from common.UnzipTemp().
In addition to the unzipping work, common.UnzipTemp() kindly bundles an
open ZipFile object as part of the return value. It doesn't look very
helpful to the callers though. It also looks less obvious that the
caller needs to properly close the handle (missing the close here is
benign though). This CL just removes the ZipFile object out of the
return value, and leaves the work to callers.

Test: `m dist` on both of A/B and non-A/B target.
Test: python -m unittest test_add_img_to_target_files
Test: python -m unittest test_common
Test: python -m unittest test_ota_from_target_files
Test: Check the callers to common.UnzipTemp() in code search.
Change-Id: Id47da3fd42a0e76d6ae8851f05780db319ee48cf
2018-03-01 10:03:31 -08:00
Andreas Gampe 5147749d1a Build: Add some dex2oat boot image error message
Typical failure case for boot image dex2oat is an inconsistent boot
classpath left over from incomplete build dependencies. Give advice
to run a top-level build.

Bug: 73749543
Test: m
Change-Id: I81c4ce9d02b2b360fe867b594d0a2b21c763e473
2018-03-01 08:47:44 -08:00
Andreas Gampe fc2fefcd83 Build: Factor out ANDROID_LOG_TAGS
Factor out ANDROID_LOG_TAGS for boot image compilation. Do not use
the setting when ART_BOOT_IMAGE_EXTRA_ARGS is set.

Bug: 73749543
Test: m
Test: ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" m art-boot-image
Change-Id: Ia599381991f74f243fee966184715b0172742e78
2018-03-01 08:47:44 -08:00
Alan Viverette 53f6b2a80b Move Support Library dependencies to their own var with resolution
Bug: 73250914
Test: make checkbuild
Change-Id: Ibdbe2fd140133202b266ca4f233c4d42292fa3df
2018-03-01 16:12:31 +00:00
bohu cc8ec5daca Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb141 am: db14a186ae
am: 82a75cd201

Change-Id: Iec85fd60c22ea79c999d288f94e90099472f0c53
2018-03-01 06:08:20 +00:00
bohu 82a75cd201 Merge "emulator: use 4.4 kernel for x86 and x86_64" am: 01670eb141
am: db14a186ae

Change-Id: Icf6d0eb621786c10e5f657fbb9b93f76a1f9e6ca
2018-03-01 05:52:29 +00:00
bohu db14a186ae Merge "emulator: use 4.4 kernel for x86 and x86_64"
am: 01670eb141

Change-Id: Id8cfdb7474a7d8586a3874cdebb4410e1ea0b10e
2018-03-01 05:42:53 +00:00
Treehugger Robot 01670eb141 Merge "emulator: use 4.4 kernel for x86 and x86_64" 2018-03-01 05:28:50 +00:00
Nan Zhang 5ebbb19f8f Merge "Change name of droiddoc target output to *-stubs.srcjar" am: 690aaa95ad am: 7eb52545bd
am: 65a89f9ac7

Change-Id: I2d790894e30d2fe230f1b4a87d70c6dc5666dd0e
2018-03-01 02:30:05 +00:00
Nan Zhang 65a89f9ac7 Merge "Change name of droiddoc target output to *-stubs.srcjar" am: 690aaa95ad
am: 7eb52545bd

Change-Id: If82350f66a5c5a770f6e9c684a9635ddc74cabfe
2018-03-01 02:25:29 +00:00
Nan Zhang 7eb52545bd Merge "Change name of droiddoc target output to *-stubs.srcjar"
am: 690aaa95ad

Change-Id: I1da56ea123e9c68cd1ed6349272b220702b26d0d
2018-03-01 02:20:23 +00:00
Treehugger Robot 690aaa95ad Merge "Change name of droiddoc target output to *-stubs.srcjar" 2018-03-01 02:06:54 +00:00
Jayant Chowdhary 67e0cc5d63 Collect all lsdump paths and write them to $(OUT_DIR).
$(OUT_DIR)/target/product/$(TARGET_DEVICE)/lsdump_paths.txt will contain all
.lsdump paths relative to $(ANDROID_BUILD_TOP). This helps faster lookup while
running scripts to generate reference dumps.

Test: m -j findlsdumps for aosp_arm64_ab.
      $OUT_DIR/lsdump_paths/generic_arm64_ab/paths.txt has paths to lsdump files
      generated for the build.

Test: m -j findlsdumps for aosp_arm_ab.
      $OUT_DIR/target/product/generic_arm_ab/lsump_paths.txt has paths to
      lsdump files generated for the build.

Change-Id: Iab1640f57bf9d0af5e88e6dda64a610fedcbe87e
2018-02-28 16:29:51 -08:00
Nan Zhang 9c98cb4815 Change name of droiddoc target output to *-stubs.srcjar
Test: m -j core-docs
Bug: b/70351683
Change-Id: I3fa696517175764b64a3b66d25ab04f02e561e51
2018-02-28 16:11:47 -08:00
Andreas Gampe 683ea67560 Merge "Build: Silence patchoat" am: cacaf6ba6e am: f18fd60ebe
am: 5c48f2dac3

Change-Id: Ic1b246010b09a1292a247f7194321409c2f704ed
2018-02-28 23:54:10 +00:00
Andreas Gampe 5c48f2dac3 Merge "Build: Silence patchoat" am: cacaf6ba6e
am: f18fd60ebe

Change-Id: I33763f05931e1ad341a0bc49fab7dcdb005986ed
2018-02-28 23:48:46 +00:00
Andreas Gampe f18fd60ebe Merge "Build: Silence patchoat"
am: cacaf6ba6e

Change-Id: I59044dcca627a1fd0bf3741f0b25886dfe661c93
2018-02-28 23:43:46 +00:00
Treehugger Robot cacaf6ba6e Merge "Build: Silence patchoat" 2018-02-28 23:36:26 +00:00
Tao Bao 7a08313a5e Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()." am: a7a5e15f72 am: fc0bb788ed
am: e9f3ee0f80

Change-Id: Ie5cf8533ae02aab3f52c3652b2afc55c729e16f2
2018-02-28 21:37:09 +00:00
Tao Bao e9f3ee0f80 Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()." am: a7a5e15f72
am: fc0bb788ed

Change-Id: Icb0ffb498e068417bdadabd4877731c63b776f37
2018-02-28 21:30:30 +00:00
Tao Bao fc0bb788ed Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()."
am: a7a5e15f72

Change-Id: I8d6ca18c251ffb6d794ce5859b05de8b3c43bcfc
2018-02-28 21:24:53 +00:00
Treehugger Robot a7a5e15f72 Merge "releasetools: Move one case of mkdtemp() to common.MakeTempDir()." 2018-02-28 21:07:51 +00:00
bohu 856954ca6a emulator: use 4.4 kernel for x86 and x86_64
BUG: 72886167

Test: build aosp_x86 and aosp_x86_64
emulator boots complete

Change-Id: I388a775fe50ca60c938b097faf6bf4296d5c9a54
2018-02-28 11:41:41 -08:00
Tao Bao 04bce3a696 releasetools: Move one case of mkdtemp() to common.MakeTempDir().
This should be the last case to be moved over.

Test: Generate an incremental BBOTA (which exercises the changed code).
Test: `rgrep mkdtemp` gives no more instance.
Change-Id: I76db069476201cdfaf3a2de9d9635dfe54507f7a
2018-02-28 11:13:29 -08:00
Yahan Zhou cf50451225 Merge "Add board name for emulator" am: 39acbe6446 am: 0547230ac1
am: dddbf1fecb

Change-Id: I2783184d28c2987c481bc1aa0b3f1a5941996896
2018-02-28 18:59:28 +00:00
Yahan Zhou dddbf1fecb Merge "Add board name for emulator" am: 39acbe6446
am: 0547230ac1

Change-Id: Ia998564a709841a7ab162891164f73aea639b7d4
2018-02-28 18:53:20 +00:00
Yahan Zhou 0547230ac1 Merge "Add board name for emulator"
am: 39acbe6446

Change-Id: I19e28922d77bfe3eab29091b8d72a5cdfae39fe3
2018-02-28 18:48:12 +00:00
Treehugger Robot 39acbe6446 Merge "Add board name for emulator" 2018-02-28 18:33:15 +00:00
Jeff Gaston 7752903259 Merge "Clearer error if module doesn't declare any source files" am: c4343864ed am: cf9d0cf4dd
am: 0aeef2a0db

Change-Id: Ifc6fe286a6147794ffb3c1d428fb6051800f8399
2018-02-28 16:48:49 +00:00