Commit Graph

50566 Commits

Author SHA1 Message Date
Dan Willemsen
2ae5ff07fa Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
am: e346d8c25e

Change-Id: Ie1b1a4befc9e7f82b58fb91faecb7c49c15c0ad7
2019-06-18 16:07:36 -07:00
Tao Bao
269c12a5b9 Merge "releasetools: Update partitions in deterministic order."
am: aadc9b9159

Change-Id: I3ae59fc50f0c4200043c7c4d94b02d6f9ac75e26
2019-06-18 15:54:45 -07:00
Tom Cherry
1e6a49a22a Merge "Update fs_config documentation"
am: 0405f780fc

Change-Id: I49e13626b13302aaf12f686963a0a970996bf262
2019-06-18 15:51:48 -07:00
Treehugger Robot
e346d8c25e Merge changes from topics "rbe-deps-dexpreopt-images", "rbe-deps-system-modules"
* changes:
  Use dexpreopt image deps from Soong
  Depend on all the files from system modules
2019-06-18 22:48:22 +00:00
Tao Bao
aadc9b9159 Merge "releasetools: Update partitions in deterministic order." 2019-06-18 22:20:26 +00:00
Treehugger Robot
0405f780fc Merge "Update fs_config documentation" 2019-06-18 22:08:46 +00:00
Tao Bao
f1113e97ae releasetools: Update partitions in deterministic order.
Previously it was using regular dict.

Test: python -m unittest test_common.DynamicPartitionsDifferenceTest
Change-Id: If108a4512aeaf9d3c8775c030cad6e44342b9d3d
2019-06-18 12:14:32 -07:00
Neil Fuller
b8e30c7602 Merge "Remove a host simulation of the runtime module"
am: c4924c616c

Change-Id: Icc6f7f25722a6f444e27b38376ee847a28198299
2019-06-18 08:48:06 -07:00
Neil Fuller
c4924c616c Merge "Remove a host simulation of the runtime module" 2019-06-18 15:33:11 +00:00
Dan Willemsen
cb4c357661 Use dexpreopt image deps from Soong
Instead of just depending on the single image file, depend on the entire
image that gets loaded -- the .oat / .vdex files, and the modules that
are part of the image that have their own files.

This is necessary for RBE, where the rule only gets the files that it
depends upon.

Test: treehugger
Test: build a system image with RBE
Change-Id: I93a580b42cf4ef1824ee1397e551c065f083348a
2019-06-18 01:19:04 +00:00
Dan Willemsen
70b934ee64 Depend on all the files from system modules
Test: treehugger
Change-Id: Ie84dda3d05a84658ad9386a3034d861138f25b2c
2019-06-18 01:19:04 +00:00
Tom Cherry
de18e892d3 Update fs_config documentation
While searching for some fs_config related symbols, I ran across this
being out of date, so update it.

The new documentation defers to the help section of the underlying
script more to hopefully avoid this in the future.

Test: n/a
Change-Id: I94893cbb29b8d7e81963a12e3f8316ac3f41b7ae
2019-06-17 13:31:28 -07:00
Patrick Tu
f7f933b28b Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json"
am: 58982618e1

Change-Id: Idd3f21584984bf1c9a51bc83704da016f38dad36
2019-06-16 21:10:46 -07:00
Patrick Tu
58982618e1 Merge "AIDEGen: Collect the classes.jar of the prebuilt modules into module-info.json" 2019-06-17 02:51:56 +00: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
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
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
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
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
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
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
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
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
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
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
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
Dan Willemsen
083777a4c9 Merge "Add missing dependencies to python scripts"
am: 56bfae6402

Change-Id: I31d5324e4805d3f9a17444f23c7add3d1e3fdb5a
2019-06-10 20:32:39 -07:00
Treehugger Robot
56bfae6402 Merge "Add missing dependencies to python scripts" 2019-06-11 03:15:54 +00:00
Dan Willemsen
a5ce550534 Merge "Convert java proto generation to use srcjars"
am: 68c39b5d06

Change-Id: I94421770a915f3f3c9496d9f4155b43bfbfcc64b
2019-06-10 20:03:01 -07:00
Treehugger Robot
68c39b5d06 Merge "Convert java proto generation to use srcjars" 2019-06-11 02:51:18 +00:00