Commit graph

49266 commits

Author SHA1 Message Date
Anton Hansson
6b329bc60d Merge "Move bootimage props to vendor/build.prop" 2019-04-09 14:01:51 +00:00
Florian Mayer
1d26ca95c3 Merge "Revert "Only assert-max-image-size for static partitions."" 2019-04-09 13:21:23 +00:00
Paul Duffin
70a875afec Merge "Remove android.test.base from bootclasspath" 2019-04-09 10:35:41 +00:00
Florian Mayer
6e099095d1 Revert "Only assert-max-image-size for static partitions."
This reverts commit 67e4336912.

Reason for revert: Broke master

Change-Id: I8a5054a42f145881437e2cb5b372f276bfdaa3d2
2019-04-09 09:54:59 +00:00
Anton Hansson
f49c38c2c1 Merge "Enable JIT Zygote experiment in mainline boardconfig" 2019-04-09 08:42:32 +00:00
Xin Li
a76f88be02 Merge "DO NOT MERGE -- Merge PPRL.190405.003 into master" 2019-04-09 04:29:23 +00:00
Treehugger Robot
3c4889fc79 Merge changes from topic "dap_size_check"
* changes:
  Only assert-max-image-size for static partitions.
  sparse_img.py --get_partition_size return size of partition
  Revert "Fix dynamic partition size check for devices with recovery"
2019-04-09 02:17:36 +00:00
Xin Li
8d900c6144 DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: I677403b7e0038f4ba74270b4ce8553a360e46734
2019-04-08 18:56:51 -07:00
Mathieu Chartier
6cbc3899b3 Specify default image block size of 512KB by default
Enables parallel decompression.

Test: manual
Bug: 116052292
Change-Id: I172935c8dd9c729199d9015e82487f84018bb9f4
2019-04-08 13:56:40 -07:00
android-build-team Robot
505063f5ad Make change and version bump to PPRL.190405.003
Change-Id: I9a4ecf96a9bfac0eef95d5176cf05b4f84ec7699
2019-04-08 18:50:28 +00:00
android-build-team Robot
10d2ada411 Make change and version bump to PPRL.190405.001
Change-Id: I3f3474b30f18066560d8bd51dd72f183894918fe
2019-04-08 18:16:44 +00:00
Anton Hansson
15794ca03c Move bootimage props to vendor/build.prop
Prior to this change the properties were in system/etc/default.prop.
These properties are device-specific and don't really belong on the
/system partition.

I anticipate further change to these properties in the future:
- pruning down the set of properties, as the .product. props
  don't make much sense for the boot image
- moving them to the ramdisk instead

Bug: 130025216
Test: boot into recovery, observe title (shows bootimage fingerprint)
Change-Id: I9e92c1ec7068ae18fa0d709c77eac22a6b88c3d8
2019-04-08 17:47:35 +01:00
Paul Duffin
fad04b7591 Remove android.test.base from bootclasspath
Default to exclude android.test.base from the bootclasspath unless the
REMOVE_ATB_FROM_BCP flag is set to false.

Bug: 73711752
Test: make droid, flash, atest -p cts/tests/signature/
Change-Id: Iabcda707ff0f0b4ec7cade1125938a2759af8f76
2019-04-08 10:32:05 +01:00
Nicolas Geoffray
6b529750c5 Merge "Move the profile rule out of dex_preopt_libart.mk." 2019-04-08 08:55:19 +00:00
Treehugger Robot
6afe016825 Merge "Remove our clang-tidy wrapper" 2019-04-05 21:58:36 +00:00
Anton Hansson
66bd1852f1 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-05 18:45:17 +01:00
Nicolas Geoffray
7e8ca9a174 Move the profile rule out of dex_preopt_libart.mk.
We only need to define it once. dex_preopt_libart.mk can be read
multiple times if there are many boot image.

Test: m && no warning
Bug:119800099
Change-Id: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19
2019-04-05 18:44:15 +01:00
Treehugger Robot
639861ab66 Merge "Don't feed framework.jar to proguard for vendor apks" 2019-04-05 12:40:18 +00:00
Nicolas Geoffray
39099e8498 Merge "Pass DEXPREOPT_USE_APEX_IMAGE to soong." 2019-04-05 09:34:34 +00:00
Anton Hansson
049c1f9235 Merge "Move device-specific vars from mainline common" 2019-04-05 06:44:44 +00:00
George Burgess IV
09e5d9b2ba Remove our clang-tidy wrapper
Looks like the reason for it existing has been fixed. It should probably
just be removed.

Bug: None
Test: WITH_TIDY=1 m
Change-Id: Ic001393da7211cd6ef2bbd5af6ef13c7fe8e00e7
2019-04-04 16:21:53 -07:00
Treehugger Robot
405d3a4ade Merge "Build non-sparse super image if necessary." 2019-04-04 23:16:06 +00:00
Yifan Hong
67e4336912 Only assert-max-image-size for static partitions.
assert-max-image-size doesn't make sense for
dynamic partitions, as build_image.py always find the
right size for the output image. Hence:

- build_image.py no longer need to write generated_*_info.txt
  (which contains the size of the image).
- assert-max-image-size on the static BOARD_*IMAGE_PARTITION_SIZE. If
  a partition is dynamic, that variable isn't set, and
  assert-max-image-size becomes a no-op. If the partition is static,
  assert-max-image-size checks the static partition size as it used
  to be.
- Fix read-size-of-partitions to use the size of the partition by
  reading the image directly (instead of using generated_*_info.txt).

For devices without AVB, with DAP enabled, and does not have
RESERVED_SIZE for partitions, because of right sizing, the original
code always warns about approaching size limits. Since such checks
doesn't make sense for dynamic partitions, remove them.

Test: builds on device with dynamic partitions
Test: builds on cuttlefish with DAP enabled (without AVB), no
      more size limit warnings:
WARNING: out/target/product/vsoc_x86/vendor.img approaching size limit (X now; limit X)

Fixes: 122377935
Change-Id: I75e1b8322197cb18cf397d02aefd49d777bb6405
2019-04-04 15:09:51 -07:00
Jaewoong Jung
15d56810ca Merge "prebuilt_internal.mk refactoring." 2019-04-04 21:52:47 +00:00
Elliott Hughes
24e47858f2 Merge "Remove 'column' from modules target" 2019-04-04 20:17:05 +00:00
Yifan Hong
7ad83b634e sparse_img.py --get_partition_size return size of partition
Also, move code from build_super_image.py to sparse_img.py.

Test: sparse_img.py on sparse and non-sparse images
Bug: 122377935
Change-Id: Ie91fdfdbb54298ea27eb20d1b5363aeb1470356e
2019-04-04 12:59:00 -07:00
Yifan Hong
bd4301e190 Revert "Fix dynamic partition size check for devices with recovery"
Reason for revert: size check is removed for devices
with dynamic partitions because it doesn't make sense.

Bug: 122377935
Bug: 120043292
Bug: 124489494
Test: build cuttlefish

This reverts commit accf09b2e0.

Change-Id: I289faf11a08acbcef36924eb747a15f55124ce79
2019-04-04 12:48:14 -07:00
Nicolas Geoffray
0639b7de03 Pass DEXPREOPT_USE_APEX_IMAGE to soong.
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image
Bug: 119800099
Change-Id: Ieb8f36b94264496a41998d4ceca30e1f41a98ebe
2019-04-04 18:51:32 +01:00
Anton Hansson
91aa9414c0 Move device-specific vars from mainline common
Move a couple of variables out of BoardConfigMainlineCommon
because they vary either by device or by how they build in
AOSP vs internal.

Bug: 80410283
Test: presubmit
Change-Id: Ia42df91ad8c8d8fc4618be375a17ea23896f4352
2019-04-04 17:33:51 +01:00
David Sehr
9dd7ee7ce1 Merge "Remove dalvik/dexdump and rename dexdump2" 2019-04-04 15:28:51 +00:00
Anton Hansson
6de8abc920 Merge "Indent the install_jni_libs makefiles" 2019-04-04 10:33:59 +00:00
Colin Cross
f78f0ce542 Merge "Export more config values to Soong" 2019-04-04 04:00:13 +00:00
Treehugger Robot
3fb753c0a2 Merge "supernod: make intermediates directory." 2019-04-04 00:31:26 +00:00
Treehugger Robot
a05dbdd6dc Merge "Skip checking ELF files for uninstallable soong modules" 2019-04-04 00:00:10 +00:00
Yifan Hong
058ddaea8d Merge "Add libcgrouprc.so to LL-NDK" 2019-04-03 19:08:51 +00:00
Yifan Hong
cb35bd9e51 Build non-sparse super image if necessary.
If TARGET_USERIMAGES_SPARSE_EXT_DISABLED is set, don't provide
--sparse to lpmake, so that a non-sparse super image is built.

Test: build with the flag set.
Fixes: 120041578
Change-Id: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
2019-04-03 10:58:25 -07:00
Yifan Hong
438175e7de supernod: make intermediates directory.
Test: delete the directory, then `m supernod`
Change-Id: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
2019-04-03 10:58:09 -07:00
David Sehr
976c3c3651 Remove dalvik/dexdump and rename dexdump2
Complete the migration to use art/dexdump.

Bug: 22322814
Test: make -j 50 checkbuild test-art-host-dexdump
Change-Id: Ie69bed375dff79f66add5bdb6a8b1b7e14d8a173
2019-04-03 09:30:06 -07:00
Treehugger Robot
78ec599720 Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" 2019-04-03 15:27:21 +00:00
Johan Harvyl
7005d4f4cc Remove 'column' from modules target
The standard target modules stopped working when restrictions in
soong were introduced to which binaries are allowed to be used during
builds.

Listing a very large amount of modules in columns does not make it
more readable and harder to work with in tools so just drop it.

Bug: 129800175
Test: make modules
Change-Id: I26040479a03916161fb5d072de1af640d8080c7f
2019-04-03 07:41:43 -07:00
Jiyong Park
eadd1bdb8e Don't feed framework.jar to proguard for vendor apks
We used to add framework.jar to proguard via -systemjars option even
for the apks building againsd SDK. This was because the app might have
references to hidden APIs via static libraries, etc.

However, for vendor apks, the use of hidden API is strictly prohibited.
So it is fine to not include framework.jar. Furthermore, including
framework.jar even causes problems in some cases; if a java library
(e.g., android.hidl.base-V1.0-java) is statically linked to both the app
and the framework.jar, -systemjars frameworks.jar forcibly removes
classes in the library from the app to have references to the non-public
classes in framework.jar. This could fail some compliance tests.

Fixing the problem by not raising SDK for apks located in vendor or odm
partitions.

Bug: 128574081
Test: m
Change-Id: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
2019-04-03 22:35:34 +09:00
Anton Hansson
74a36536c3 Indent the install_jni_libs makefiles
These files are pretty dense, and are difficult to read
without indentation.

Bug: 129323707
Test: noop on presubmits
Change-Id: I5fde5429120e80a8c6329ea43d32b3ee324a2632
2019-04-03 14:24:43 +01:00
Anton Hansson
7369b7622f Merge "Add more product defaults to mainline.mk" 2019-04-03 08:28:06 +00:00
Nicolas Geoffray
31a7dee48b Merge "Re-order the ext/framework boot jars in bootclasspath." 2019-04-03 07:27:55 +00:00
Colin Cross
e257b26059 Export more config values to Soong
Export more config values to Soong that will be use dto generate
robolectric's build.prop.

Bug: 122331577
Test: m checkbuild
Change-Id: I1e9dd165772a071cf78927b3bf1e29e01290a42e
2019-04-02 22:57:43 -07:00
Yifan Hong
4ceadcda40 Add libcgrouprc.so to LL-NDK
Bug: 123664216
Test: builds
Change-Id: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
Merged-In: I8228580879c6eb3d44a9111a6ed09b328df4a2c8
2019-04-02 22:32:34 -07:00
Treehugger Robot
9e4e30e219 Merge "Remove a few entries from PRODUCT_HOST_PACKAGES" 2019-04-03 02:01:56 +00:00
joker.yang
a75c9a5079 Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility
We have developed a vendor module and set LOCAL_VENDOR_MODULE := true<space> (Added a space character at the end)
The android build system then can't installed it in the right partition until we removed the extra space character.

bug: 129725067

Change-Id: I081ffe7f39a9c850007ba304c815436500be694c
2019-04-03 01:31:43 +00:00
Dan Willemsen
a15c3a838d Remove a few entries from PRODUCT_HOST_PACKAGES
adbd shouldn't be needed on the host in most cases

selinux_policy_system is a device PHONY_PACKAGE that will stop working
soon in PRODUCT_HOST_PACKAGES. I talked to jeffv and he's fine removing
it for now, adding back individual binaries if desired, or creating a
new host PHONY_PACKAGE.

shell_and_utilities_system is a similar device phony module. enh is fine
with it not being installed on the host by default for now, and we can
add them back as needed.

Test: treehugger
Change-Id: I1938f9f4ea5dbea2905baaf301473b617de9c530
2019-04-02 16:03:28 -07:00
Vic Yang
841ab06af1 Skip checking ELF files for uninstallable soong modules
If a module is uninstallable, the shared library dependencies are not
set up and thus the ELF file check may fail incorrectly.  In this case,
there is no need to check ELF files anyway.

Test: Build walleye with no-vendor-variant VNDK enabled and does not
      see erroneous failure anymore.

Change-Id: Icd115fc82daedf11795800de5cbe87c87073586a
2019-04-02 14:06:22 -07:00