Commit Graph

41641 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
cf9d0cf4dd Merge "Clearer error if module doesn't declare any source files"
am: c4343864ed

Change-Id: If77ec73bc0553720c8560093c8d30eee978e315f
2018-02-28 16:36:03 +00:00
Jeff Gaston
c4343864ed Merge "Clearer error if module doesn't declare any source files" 2018-02-28 16:26:36 +00:00
Andreas Gampe
10c86d588e Build: Silence patchoat
Move it to only log error-level messages, similar to dex2oat.

Test: m
Change-Id: I2884fa19aa084ac2f4cb115b0600dbe061685266
2018-02-27 20:38:00 -08:00
Dan Willemsen
144cb73501 Merge "Revert "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts"""
am: 08e604e741

Change-Id: I8896573f39abdb8fb43b18ce339f69045cb54a43
2018-02-28 03:21:26 +00:00
Treehugger Robot
08e604e741 Merge "Revert "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts""" 2018-02-28 03:07:21 +00:00
Yahan Zhou
12b5395c2f Add board name for emulator
VTS checks for ro.product.board before running. Emulator does not have
that value and causes an exception.

So let's add it to the emulator and call it goldfish_$(TARGET_ARCH).

BUG: 73741117
Test: vts-tradefed run vts, should run the tests
Change-Id: I6b00f2923bc9609d4d05c45d47ceddd2bd7be091
2018-02-27 18:11:48 -08:00
Jeff Gaston
960acf1b88 Clearer error if module doesn't declare any source files
Bug: 72552006
Test: Make a module with no source files,
      run `m -j nothing`, notice that the error tells
      which module has no sources

Change-Id: Ib169e7b3cb86d840a3acd644e42cd1f9f65e1304
2018-02-27 20:52:53 -05:00
Dan Willemsen
926ee44603 Revert "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts""
This reverts commit f78069865b.

Reason for revert: fixed mips

Bug: 73904572
Test: lunch aosp_mips-eng; m nothing
Change-Id: I4f51f91210f1d78ec97e450ac6e0509797c62bb9
2018-02-27 23:32:49 +00:00
Dan Willemsen
5dd9c2c652 Merge "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts""
am: e752292f26

Change-Id: Icfe3c46be58662336eada7cab8b4c4b24069ccf5
2018-02-27 23:25:47 +00:00
Dan Willemsen
e752292f26 Merge "Revert "Better error for missing LOCAL_SRC_FILES in prebuilts"" 2018-02-27 23:17:43 +00:00
Dan Willemsen
f78069865b Revert "Better error for missing LOCAL_SRC_FILES in prebuilts"
This reverts commit 8d5dc6be57.

Reason for revert: broke mips targets

Change-Id: Ib8cb21e6d480b0745911efeba1f23932ddc7c2f8
2018-02-27 23:16:12 +00:00
Dan Willemsen
4e7e4647bd Merge "Better error for missing LOCAL_SRC_FILES in prebuilts"
am: 3279e0c267

Change-Id: I9ff396e4a4f03c59d5b5c9f127d848bdfc7d29f6
2018-02-27 22:26:51 +00:00
Tao Bao
945e9c3e44 Merge "releasetools: Remove the unneeded 'prefix' parameters."
am: 6e2a8ae094

Change-Id: I6d83836b37de41674817ce3eab5f92fddeb1de35
2018-02-27 22:26:16 +00:00
Dan Willemsen
3279e0c267 Merge "Better error for missing LOCAL_SRC_FILES in prebuilts" 2018-02-27 22:19:49 +00:00
Tao Bao
6e2a8ae094 Merge "releasetools: Remove the unneeded 'prefix' parameters." 2018-02-27 22:13:06 +00:00
Bruno Martins
20c90b07b5 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES"
am: 7889d64db2

Change-Id: I50a6783914549e53f57cf5699df073f2f650b2ed
2018-02-27 22:00:47 +00:00
Treehugger Robot
7889d64db2 Merge "core_base: Remove duplicated Wifi modules from PRODUCT_PACKAGES" 2018-02-27 21:47:23 +00:00
Dan Willemsen
39f4686998 Merge "Remove some uses of export/unexport"
am: 76d45d8ddf

Change-Id: Ibd1f7146861a278bc2c71dae2e3f654e36b3b739
2018-02-27 21:30:30 +00:00
Dan Willemsen
76d45d8ddf Merge "Remove some uses of export/unexport" 2018-02-27 21:22:20 +00:00
Tao Bao
886d883d61 releasetools: Remove the unneeded 'prefix' parameters.
... from the following functions in add_img_to_target_files.py.

  AddSystem
  AddSystemOther
  AddVendor
  AddProduct
  AddDtbo
  AddUserdata
  AddVBMeta
  AddPartitionTable
  AddCache

The last user of the parameter in img_from_target_files.py has been
removed in commit 2bb109709a (in O).

Test: pylint --rcfile=pylintrc add_img_to_target_files.py
Test: Check all the callers to the above functions.
Test: m dist
Change-Id: I551d1683def8f8535062fc90f68dafa0f4252822
2018-02-27 11:47:11 -08:00
Nick Kralevich
439ecf8088 Merge "remove nnk from OWNERS"
am: d6fa5bbc51

Change-Id: I65350a259e9f40e566046e97fd127abf7d50d0fd
2018-02-27 19:16:22 +00:00
Treehugger Robot
d6fa5bbc51 Merge "remove nnk from OWNERS" 2018-02-27 19:04:47 +00:00
Nick Kralevich
0aa64275e8 remove nnk from OWNERS
See https://android-review.googlesource.com/c/platform/system/sepolicy/+/626014

Also remove klyubin who is no longer at Google.

Test: none
Change-Id: I98534c0cc676e41129b73331ad0e71e7fc1aa1ab
2018-02-27 09:15:10 -08:00
Luis Hector Chavez
6128d7f30d Merge "Make mksquashfs generate a fs_config-friendly root entry"
am: 3d4fb4e335

Change-Id: I1cfd3479b52a950438ff1b2a68d24d0884dea16a
2018-02-27 16:30:33 +00:00
Treehugger Robot
3d4fb4e335 Merge "Make mksquashfs generate a fs_config-friendly root entry" 2018-02-27 16:24:21 +00:00
Dan Willemsen
fb394978aa Remove some uses of export/unexport
All of these are already handled by soong_ui.

Test: inspect build/soong/ui/build/config.go
Change-Id: I3aa4dcd40ea92759374f9894d525507ef970a584
2018-02-27 02:14:11 -08:00
Dan Willemsen
8d5dc6be57 Better error for missing LOCAL_SRC_FILES in prebuilts
If there's a prebuilt with LOCAL_MULTILIB := true, but only a single
LOCAL_SRC_FILES entry, we end up with a weird build error where `cp`
is trying to copy the local directory. Exit early with an error in this
case.

Bug: 73904572
Test: build-aosp_marlin.ninja is identical
Change-Id: Ie2821817c237087a96e87fb9602e430e0f86584a
2018-02-26 21:01:45 -08:00
Dan Willemsen
41d79327cd Merge "Use xmllint built from source"
am: 063e6b2939

Change-Id: I554f0b5c1b7bdcb78d4f724353a2ed32610047a2
2018-02-27 04:32:58 +00:00