Commit Graph

53535 Commits

Author SHA1 Message Date
Dan Shi 4bfef31571 Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder" am: fde58bccbc
am: 4722b5b158

Change-Id: Ifc9d04794b8a5bf9bc5cc3eb6efd4529c05e839a
2019-06-14 15:45:15 -07:00
Dan Shi 4722b5b158 Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder"
am: fde58bccbc

Change-Id: I271b0b67e7ae9a7df8a3f17b4cbbd362ece5cfe1
2019-06-14 15:37:11 -07:00
Dan Shi fde58bccbc Merge "Update auto-gen test config template with EXTRA_CONFIGS placeholder" 2019-06-14 22:21:39 +00:00
Daniel Norman c7c103514f Merge "Allows skipping building the super images for partial builds." am: 87ebb3013f
am: d3576727ea

Change-Id: I872f713f9f8ff30b3dd72643b07443894b5af451
2019-06-14 15:12:25 -07:00
Daniel Norman d3576727ea Merge "Allows skipping building the super images for partial builds."
am: 87ebb3013f

Change-Id: I67085d543d8bdeea742e50f4bfae6cf586acb18f
2019-06-14 14:59:00 -07:00
Treehugger Robot 87ebb3013f Merge "Allows skipping building the super images for partial builds." 2019-06-14 21:42:33 +00:00
Dan Willemsen 27e5d4e886 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY" am: 2e1516dc44
am: 8a0a26b246

Change-Id: I55bd3f5c4f8f6863b154c8bdb02c187b568872af
2019-06-14 14:13:45 -07:00
Hridya Valsaraju a0d14a8647 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" am: acfbc544e6
am: a7f33ab8d9

Change-Id: I9b8df9e495a20bc01bbe383c3f1d359faa9cea94
2019-06-14 14:12:02 -07:00
Dan Willemsen 8a0a26b246 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY"
am: 2e1516dc44

Change-Id: Ibffc6ffb73d1efe2c9fa7d9c821774ca0916e7a1
2019-06-14 13:56:43 -07:00
Hridya Valsaraju a7f33ab8d9 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit"
am: acfbc544e6

Change-Id: Id2af75f3fdacddae343da59bb85f6ab71c80e1ca
2019-06-14 13:55:39 -07:00
Paul Scovanner c639959061 Update Security String from 08-05 to 2019-08-01 Bug:126590667 am: ead61ed19e
am: ef7c2c7915

Change-Id: I4a4c8d8fa0a1a4dc9ecd1dc2cb2a235c730fe223
2019-06-14 13:35:35 -07:00
Treehugger Robot 2e1516dc44 Merge "Start the deprecation of BUILD_HOST_STATIC_LIBRARY" 2019-06-14 20:28:46 +00:00
Treehugger Robot acfbc544e6 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" 2019-06-14 20:23:08 +00:00
Paul Scovanner ef7c2c7915 Update Security String from 08-05 to 2019-08-01 Bug:126590667
am: ead61ed19e

Change-Id: Iaf434bf5690c3c50371bb11266d300ab7d335184
2019-06-14 13:22:34 -07:00
Daniel Norman 0bf940cace Allows skipping building the super images for partial builds.
Previously, setting PRODUCT_BUILD_SUPER_PARTITION to false for a partial
build (with PRODUCT_USE_DYNAMIC_PARTITIONS == true) would fail to
include necessary keys in misc_info.txt that are required when merging
two partial builds to create a dynamic-partition-enabled mixed build.

This change ensures these necessary keys are included even when
PRODUCT_BUILD_SUPER_PARTITION is false. Setting
PRODUCT_BUILD_SUPER_PARTITION to false causes partial builds to skip
building super.img and super_empty.img, instead relying on these images
to come from the final merged build.

Bug: 134764140
Test: Building & booting a dynamic-partition-enabled mixed build, and
inspecting partial builds' logs / out folder to ensure that
super.img/super_empty.img were not created.

Change-Id: I99431a9a342e9b0617510e250597f3024ef39322
2019-06-14 11:42:45 -07:00
Dan Willemsen 22f69e1094 Start the deprecation of BUILD_HOST_STATIC_LIBRARY
There aren't any common users of this left on AOSP, and only a few
internally.

Test: treehugger
Change-Id: I37277dbf10aa253ef64ca748f82765d16ae1cf80
2019-06-14 09:37:42 -07:00
Hridya Valsaraju 219b6294dc Fail build when sum of sizes of logical partitions exceeds OEM-set limit
BOARD_SUPER_PARTITION_ERROR_LIMIT can be set by OEMs to cause a
build failure when the sum of sizes of logical partitions exceeds the same.
It is set to BOARD_SUPER_PARTITION_SIZE by default.

Bug: 133329143
Test: mmm -j32

Change-Id: Ief85c9ab3e3b9d071cd22b70e13b5c64bb784b9c
2019-06-14 09:34:46 -07:00
bohu 5d94c784bb Merge "emulator: add option to disable avb" am: 4934e72933
am: f32b62266a

Change-Id: I1fd1755b951d9c2cdc42e4c794b1a2e850b79b4a
2019-06-14 04:36:02 -07:00
bohu f32b62266a Merge "emulator: add option to disable avb"
am: 4934e72933

Change-Id: I15f2944839ff01f0c2756cc484b98df3c27bf6cb
2019-06-14 04:22:53 -07:00
Treehugger Robot 4934e72933 Merge "emulator: add option to disable avb" 2019-06-14 11:08:31 +00:00
Dan Shi 4c55da09db Update auto-gen test config template with EXTRA_CONFIGS placeholder
Bug: 134509111
Test: add "require_root: true" to init_benchmarks and libpower_test
build the modules, confirm the extra target preparer is added in the
test config.

Change-Id: I2fdae79d45fd1e5866ee94d1f0e59df106be2a87
2019-06-13 20:32:22 -07:00
patricktu 379f7f0ef6 AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json
Current information is not enough if the prebuilt modules are depend on
AAR libs Therefore, AIDEGen has to collect the classes.jar of the
prebuilt modules from build system.

Build module-info.json without this change:
Build time: 1m55.001s
File size: 14,918,354 Bytes

Build module-info.json with this change:
Build time: 1m56.292s
File size: 15,577,031 Bytes

Bug: 132768299
Test: 1. Checkout the internal master branch
      2. Patch this CL
      3. m -j out/target/product/generic_x86_64/module-info.json
      4. Open the module-info.json
      5. For verifying soong_java_prebuilt.mk, check the classes.jar of
         module prebuilt-google-play-* exists.
         e.g.
         "prebuilt-google-play-...": {
              ...
              "classes_jar": [
	      	"out/target/common/obj/JAVA_LIBRARIES/
		 prebuilt-google-..._intermediates/classes.jar"
	      ]
         }
      5. For verifying java_prebuilt_internal.mk, check the classes.jar
         of module ink exists.
         e.g.
	 "ink": {
	     ...
	     "classes_jar": [
	     	"out/target/common/obj/JAVA_LIBRARIES/ink_intermediates/
		 classes.jar"
	     ]
	 }

Change-Id: I09518c92260db47d2686493fa13951f316159d13
2019-06-14 10:47:18 +08:00
Dan Willemsen 6b61e81a6e Merge changes I2183ac9f,I2c76701c,Ibbe4e11a,I0706faa2,Ic5b7c4fb, ... am: 491ae5b2d1
am: fea54c0231

Change-Id: Ib485a13372709505f98643e6f69947d4c8f75a2f
2019-06-13 10:38:47 -07:00
Dan Willemsen fea54c0231 Merge changes I2183ac9f,I2c76701c,Ibbe4e11a,I0706faa2,Ic5b7c4fb, ...
am: 491ae5b2d1

Change-Id: I46112ae5396f4265d6c10f5d728355b80d7db021
2019-06-13 10:29:54 -07:00
Treehugger Robot 491ae5b2d1 Merge changes I2183ac9f,I2c76701c,Ibbe4e11a,I0706faa2,Ic5b7c4fb, ...
* changes:
  Fix dependency on BOARD_AVB_SYSTEM_KEY_PATH
  Fix some java library dependencies
  Depend on NDK libraries
  Call clean-path in more places
  Add missing dependecy on SOONG_ZIP
  Add dependencies on the toolchain (clang, etc)
2019-06-13 17:13:22 +00:00
Colin Cross 8ed5deeae1 Merge "Make kernel modules into normal installed files" am: b7035aef21
am: ffaf599a6e

Change-Id: I8c333170b760d32f109d7d82b3454f2b61769ff0
2019-06-13 04:11:39 -07:00
Colin Cross ffaf599a6e Merge "Make kernel modules into normal installed files"
am: b7035aef21

Change-Id: I811f555f6d6dd7b4f61d1a948a7cb60c7d2dafb3
2019-06-13 04:06:39 -07:00
Treehugger Robot b7035aef21 Merge "Make kernel modules into normal installed files" 2019-06-13 10:51:23 +00:00
Paul Scovanner b8e6ab17b4 Update Security String to 2019-08-05 Bug:126590667 am: a3e1c57a95
am: 3a25bc8b55

Change-Id: I2312582276fdd37adec718ff668939e595eafb4a
2019-06-12 16:12:19 -07:00
Paul Scovanner 3a25bc8b55 Update Security String to 2019-08-05 Bug:126590667
am: a3e1c57a95

Change-Id: I0b10bab75834759c3bd216fc77c38c84b445c4e2
2019-06-12 16:06:18 -07:00
Paul Scovanner ead61ed19e Update Security String from 08-05 to 2019-08-01
Bug:126590667
2019-06-12 22:51:45 +00:00
Dan Willemsen 6b72c73a50 Fix dependency on BOARD_AVB_SYSTEM_KEY_PATH
Bug: 130111713
Test: treehugger
Change-Id: I2183ac9f8c45eec178876768dfcc83ae62445293
2019-06-12 21:36:57 +00:00
Dan Willemsen f14179b3ff Fix some java library dependencies
Bug: 130111713
Test: treehugger
Test: build system image w/RBE
Change-Id: I2c76701c1ad396c1b13f873297785c736fba544d
2019-06-12 21:36:29 +00:00
Dan Willemsen b441630067 Depend on NDK libraries
Bug: 130111713
Test: treehugger
Test: build system image with RBE
Change-Id: Ibbe4e11a7681c52d2197ce35ae47d4939ca246b6
2019-06-12 21:35:46 +00:00
Dan Willemsen bbe4e11a76 Call clean-path in more places
When an Android.mk specifies a local path that is outside the current
directory, it uses '..', since we prepend $(LOCAL_PATH)/ to the given
path.

This path ('a/b/../c') gets inserted into command lines and
dependencies. For dependencies, when it gets to Ninja, Ninja calls
CanonicalizePath and removes those references ('a/c'), but the command
line is preserved.

So we've got a command line that references 'a/b', but no dependency on
it. Usually that's not a big problem, but it's an issue if we're trying
to only expose dependencies to the rule, like with RBE only sending the
dependencies to the remote workers. So use our 'clean-path' macro to
collapse the '..' references in Kati so that they don't show up in the
command line either.

Test: treehugger
Test: build a system image with RBE
Change-Id: I0706faa2ac15e9c12c720f43c7bb8171c5efd97c
2019-06-12 21:35:33 +00:00
Dan Willemsen 0706faa2ac Add missing dependecy on SOONG_ZIP
Bug: 130111713
Test: treehugger
Change-Id: Ic5b7c4fbefa83cf002c5f30c1b4646f35e718ca2
2019-06-12 21:35:24 +00:00
Dan Willemsen c5b7c4fbef Add dependencies on the toolchain (clang, etc)
Historically, we've relied on the path to the clang compiler changing in
order to trigger rebuilds instead of direct dependencies on the compiler
itself. That's somewhat more reliable, since the actual $(CLANG) file is
often a script that doesn't actually change during every update.

In Soong, we've added the dependency anyway, so do it here as well. This
makes it easier for my RBE experiments to identify when we intend to use
clang and to send the entire compiler.

Test: treehugger
Test: build a system image with RBE, find that every command that needed
the compiler gets it.
Change-Id: I3838b5d77884394a8c0f7a1ba133142102602084
2019-06-12 21:34:52 +00:00
Alexander Smundak b97e73b0d6 Merge "Tune JVM, print full diagnostics on crash." am: f25ffc0a98
am: 50385ee9f3

Change-Id: I265cb14efe0b64716fbf092865e9a541e86575b8
2019-06-12 09:06:04 -07:00
Alexander Smundak 50385ee9f3 Merge "Tune JVM, print full diagnostics on crash."
am: f25ffc0a98

Change-Id: I2563fbfb376d183ababf160a2f729480d9c7eecb
2019-06-12 08:53:48 -07:00
Alexander Smundak f25ffc0a98 Merge "Tune JVM, print full diagnostics on crash." 2019-06-12 15:33:06 +00:00
Oliver Nguyen 6f69d2164b Merge "Package coverage files as a zip." am: 6aef14d0e9
am: dcb71cf2bb

Change-Id: I7437fe7d5ff8f2b90f110f8e6e0787ed1c900a61
2019-06-11 19:27:56 -07:00
Oliver Nguyen dcb71cf2bb Merge "Package coverage files as a zip."
am: 6aef14d0e9

Change-Id: I3acdb8603dad615c7a3b775fd8e360fdf958007b
2019-06-11 19:21:54 -07:00
Treehugger Robot 6aef14d0e9 Merge "Package coverage files as a zip." 2019-06-12 02:00:01 +00:00
Sasha Smundak a638788c1a Tune JVM, print full diagnostics on crash.
JVM occasionally (0.5% time) crashes on entering a method with SIGSEGV.
It might be due to excessive load on the host machine. Reduce the number
of the compiler threads to 6, and do not start all the GC threads
immediately. If JVM crashes, copy full diagnostics to stderr.

Bug: 132766811
Test: treehugger
Change-Id: Ic1b09e0f2cbcf4c22214eaaeae464899b2b99ef7
2019-06-11 13:29:12 -07:00
Paul Scovanner a3e1c57a95 Update Security String to 2019-08-05
Bug:126590667
2019-06-11 19:46:33 +00:00
Tim Joines bc645922b1 Merge "Enabled traced on Android Go devices by default." into qt-dev
am: 6d98e83561

Change-Id: I6499516256a06f6bafbad3943a816858ae5415ce
2019-06-11 10:30:02 -07:00
Tim Joines 6d98e83561 Merge "Enabled traced on Android Go devices by default." into qt-dev 2019-06-11 17:21:04 +00:00
Tao Bao d05c5b091c Merge "releasetools: No-op change to use common.AVB_VBMETA_PARTITIONS." am: 4995d2fe16
am: 601fc23eee

Change-Id: Iee9f77ce710d988750417e6f2729d8508129aea7
2019-06-11 08:20:58 -07:00
Tao Bao 601fc23eee Merge "releasetools: No-op change to use common.AVB_VBMETA_PARTITIONS."
am: 4995d2fe16

Change-Id: Iad86a2c8923cae9e20679b1acb09c6c26568146f
2019-06-11 08:15:56 -07:00
Tao Bao 4995d2fe16 Merge "releasetools: No-op change to use common.AVB_VBMETA_PARTITIONS." 2019-06-11 15:03:12 +00:00