Commit Graph

19940 Commits

Author SHA1 Message Date
TreeHugger Robot
706fa88b91 Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" into qt-dev 2019-04-18 22:46:22 +00:00
Calin Juravle
471c9170c4 Add the entire boot image to boot.zip
Add all the boot image files necessary of offline inspection and
compilation in a single zip file (boot.zip).

This replaces the previous boot_profiles_jars.zip which contained only the
jar files.

Bug: 130376456
Test: m dist

Change-Id: I25b0c03ee9e7a2c2ff25db406656ce79baff5a46
Merged-In: Ib71c4fcc0d451570d0bb0584745487c54f884fd9
(cherry picked from commit 3dfae3f149)
2019-04-18 14:28:24 -07:00
Dan Willemsen
e531685ba5 TARGET_FS_CONFIG_GEN is a list, not a single path
Bug: 130787336
Test: m oemaids_header_gen oemaids_headers passwd group
Test: Set TARGET_FS_CONFIG_GEN to a list of paths
Change-Id: I5186b378fea8865f46cfd891420ba576f36e2565
Merged-In: I5186b378fea8865f46cfd891420ba576f36e2565
(cherry picked from commit 7f25f2aed9)
2019-04-18 14:26:48 -07:00
Colin Cross
081e9b5363 Always use aapt2 for prebuilt appcompat
Running appcompat is missing a dependency on aapt/aapt2.  There
is no need to switch between aapt and aapt2, so always use aapt2
and add the missing dependency.

Fixes: 130575935
Test: treehugger
Change-Id: If32c03410fbdb3945bf20f7405de13dc8cd83038
Merged-In: If32c03410fbdb3945bf20f7405de13dc8cd83038
(cherry picked from commit a0d89b994f)
2019-04-16 23:00:52 -07:00
David Brazdil
38cd7f3c8b Enable core platform API warnings on non-user builds
Core platform API violation reporting is disabled by default and can be
enabled by setting the persist.debug.dalvik.vm.core_platform_api_policy
property. Set it to "just-warn" for non-user builds and leave disabled
on user builds.

Test: builds, boots
Bug: 125701194
Change-Id: I2f4be42373de9fdbc71c3178de6d34e07809f13a
Merged-In: I2f4be42373de9fdbc71c3178de6d34e07809f13a
(cherry picked from commit f5b3fc854f)
2019-04-15 22:06:39 +01:00
Paul Scovanner
593be3c494 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7 am: cce67c52c9
am: e90b407c2f

Change-Id: I451be3f8467540539c00be5d02798be830f89ff1
2019-04-12 20:54:41 -07:00
Paul Scovanner
e90b407c2f Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0 am: 3ae4e858b7
am: cce67c52c9

Change-Id: Iad4a6c33c50cc2fd213a6a207c920ee540ae1c43
2019-04-12 20:25:15 -07:00
Paul Scovanner
cce67c52c9 Update Security String to 2019-06-05 Bug:129374896 Merged-In: 2c26c3d4c0
am: 3ae4e858b7

Change-Id: I02ef18033096d4e6d22f0eb945b4b630104e4609
2019-04-12 19:35:43 -07:00
Paul Scovanner
3d6b8b2896 Merge "Update Security String to 2019-06-05 Bug:129374896" into qt-dev 2019-04-12 23:42:34 +00:00
Paul Scovanner
3ae4e858b7 Update Security String to 2019-06-05
Bug:129374896
Merged-In: 2c26c3d4c0
2019-04-12 18:40:01 +00:00
TreeHugger Robot
93b2a10b6e Merge "Export more config values to Soong" into qt-dev 2019-04-12 17:24:18 +00:00
Paul Scovanner
2c26c3d4c0 Update Security String to 2019-06-05 Bug:129374896 2019-04-12 16:39:24 +00:00
TreeHugger Robot
f9dca5e1d8 Merge "Convert oemaids_headers / passwd / group to Soong" into qt-dev 2019-04-12 16:06:59 +00:00
TreeHugger Robot
ec5b536446 Merge "DO NOT MERGE BUILD_ID=QT" into qt-dev 2019-04-12 00:41:32 +00:00
Dan Willemsen
b9d45c7d47 Convert oemaids_headers / passwd / group to Soong
Bug: 118089258
Test: m oemaids_header_gen oemaids_headers passwd group
Change-Id: Ie3b92a499b44391e0692da5d9ad067089a62aabb
Merged-In: Ie3b92a499b44391e0692da5d9ad067089a62aabb
(cherry picked from commit d32e6d1314)
2019-04-11 16:41:22 -07:00
Ian Pedowitz
6136d945b3 DO NOT MERGE BUILD_ID=QT
Bug: 128934651
Change-Id: Icad27eb43a782c6bf97e78076a365b0d31aefd54
2019-04-11 15:55:57 -07:00
Colin Cross
27ba4730f3 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-11 10:52:18 -07:00
Yifan Hong
0d8e89b5f8 Reland "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)

This reverts commit 6e099095d1.

Reason for revert: reland the CL

Bug: 122377935
Test: build blueline_mainline

Change-Id: Iee594b64e687decff186c0fa60f82b88608febe9
Merged-In: Iee594b64e687decff186c0fa60f82b88608febe9
2019-04-11 10:12:27 -07:00
Yifan Hong
c5aae579b7 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
Merged-In: I289faf11a08acbcef36924eb747a15f55124ce79
2019-04-11 10:12:27 -07:00
Dan Willemsen
5606d2b53b Split ALL_MODULES.*.REQUIRED and friends between target/host
So that we actually respect different LOCAL_REQUIRED_MODULES for the
host and device versions instead of unioning them. That got particularly
problematic when LOCAL_SHARED_LIBRARIES is implicitly added to
LOCAL_REQUIRED_MODULES. We also used to walk through device-only modules
when filling out the list of required modules, which triggered even more
extra installations.

This also changes the requirements for PRODUCT_HOST_PACKAGES so that it
no longer accepts target-only phony modules (since we can now
differentiate them). They were all removed in previous patches.

Bug: 123925742
Fixes: 129719937
Test: treehugger; diff resulting builds
Test: diff list of product_target_FILES and product_host_FILES
Change-Id: I2ed8950320d31f5693323ad8cef6ec5b6780b7d4
Merged-In: I2ed8950320d31f5693323ad8cef6ec5b6780b7d4
(cherry picked from commit 8e96a794ac)
2019-04-10 17:04:48 -07:00
Anton Hansson
9ce8087afc Merge "Move board-info props to vendor/build.prop" into qt-dev 2019-04-10 12:39:24 +00:00
Anton Hansson
0643efcc5a Move board-info props to vendor/build.prop
This change moves the ro.build.require.* props extracted from
TARGET_BOARD_INFO_FILE to vendor/build.prop as opposed to
system/build.prop. These typically contain what bootloader and
baseband the build requires, which are very device-specific.

Bug: 130025216
Test: make, inspect props
Test: flash blueline
Change-Id: I48642485bdc853884d465d1fe00f2ceae69a4736
Merged-In: I48642485bdc853884d465d1fe00f2ceae69a4736
2019-04-10 12:38:59 +00:00
Dan Willemsen
2ab5c90e9c Add BUILD_BROKEN_USES_NETWORK
Some people apparently still talk to the network during their build.
Allow this temporarily with a BUILD_BROKEN_USES_NETWORK check.

Bug: 129992021
Test: attempt to talk to the network during the build with and without
      this flag
Change-Id: I45612ad6165f92f123847b4057338c0dfc3424ee
Merged-In: I45612ad6165f92f123847b4057338c0dfc3424ee
(cherry picked from commit 0586c65780)
2019-04-09 21:52:19 -07:00
TreeHugger Robot
a26d2189d1 Merge "Q Branch prefix is QP1A" into qt-dev 2019-04-10 04:31:28 +00:00
Ian Pedowitz
0f38bfccab Q Branch prefix is QP1A
Bug: 128934651
Bug: 129683166
Bug: 129943426
Test: source build/envsetup.sh && lunch aosp_blueline-userdebug
Test: m -j cts docs tests
Change-Id: I34c360a68c6721e8fef9e39be30c8af7bca90c39
2019-04-09 13:44:24 -07:00
Paul Scovanner
9231b34069 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
am: 3e8a1393a7

Change-Id: I2a8ce7b192ccb2bbf23c342c88da45d9c3b3f070
2019-04-09 13:06:43 -07:00
Paul Scovanner
b196cc6543 Merge "Update Security String to 2019-06-01 Bug:129374896" into qt-dev 2019-04-09 18:49:36 +00:00
Anton Hansson
d4f9d62625 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
Merged-In: I9e92c1ec7068ae18fa0d709c77eac22a6b88c3d8
2019-04-09 16:28:22 +01:00
Nicolas Geoffray
7b504b7b75 Merge "Move the profile rule out of dex_preopt_libart.mk." into qt-dev 2019-04-08 21:51:02 +00:00
Paul Scovanner
3e8a1393a7 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0
2019-04-08 21:48:10 +00:00
Paul Scovanner
1f8f84de61 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-08 18:01:43 +00:00
Paul Scovanner
1453ddd306 Update Security String to 2019-06-01 Bug:129374896 2019-04-08 17:45:33 +00:00
Paul Scovanner
42fc9b3217 Merge "Update Security String to 2019-05-05 Bug:128322951" into qt-dev 2019-04-08 17:38:06 +00:00
Nicolas Geoffray
c2e947715e 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

(cherry picked from commit 7e8ca9a174)

Change-Id: I16d67b77142fce93c6d4acc15f557ad073b2de44
Merged-In: If5b8fbb0c3310eb42f676d7b5267dcee679f7e19
2019-04-08 09:56:29 +01:00
TreeHugger Robot
4a6b93ba16 Merge "Don't feed framework.jar to proguard for vendor apks" into qt-dev 2019-04-08 04:12:44 +00:00
Guang Zhu
be0cb591b1 Merge "Android Q is Android 10" into qt-dev 2019-04-06 00:07:10 +00:00
Paul Scovanner
5c17bbc567 Update Security String to 2019-05-05
Bug:128322951
2019-04-05 23:46:54 +00:00
Paul Scovanner
2db03695f4 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 23:32:13 +00:00
Nicolas Geoffray
0f25cbf342 Pass DEXPREOPT_USE_APEX_IMAGE to soong.
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image
Bug: 119800099

(cherry picked from commit 0639b7de03)

Change-Id: Ic76f3ad6da0425479fbe660efe0a0677e60771a2
Merged-In: Ieb8f36b94264496a41998d4ceca30e1f41a98ebe
2019-04-05 13:59:04 +01:00
Jiyong Park
678ace7e77 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
Merged-In: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
Change-Id: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
(cherry picked from commit eadd1bdb8e)
2019-04-05 21:41:00 +09:00
TreeHugger Robot
f9a550621b Merge "Build non-sparse super image if necessary." into qt-dev 2019-04-05 10:17:16 +00:00
TreeHugger Robot
da72f69a2b Merge "Remove 'column' from modules target" into qt-dev 2019-04-05 06:00:09 +00:00
Yifan Hong
c3664703f8 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.
Bug: 120041578
Change-Id: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
Merged-In: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
2019-04-04 16:36:25 -07:00
Yifan Hong
8b7fe36968 supernod: make intermediates directory.
Bug: 120041578

Test: delete the directory, then `m supernod`
Change-Id: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
Merged-In: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
2019-04-04 13:30:23 -07:00
Johan Harvyl
ca1dbcc809 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

(cherry picked from commit 7005d4f4cc)

Change-Id: I317f6eb4ba5ea633264939a9a58f716bdb36596e
2019-04-04 13:19:51 -07:00
Ian Pedowitz
0772f2a498 Android Q is Android 10
Bug: 129683166
Bug: 129943426
Test: source build/envsetup.sh && lunch blueline-userdebug && m -j cts
docs tests
Test: Flashed build to blueline, ensured it booted
Test: Verified "10" under Settings -> About phone -> Android version
Change-Id: Idec1479d93876bc57711c31e70f34008a05881d1
2019-04-04 09:12:21 -07:00
joker.yang
40301d8f1d Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720 am: 0e2559c2d6
am: 680a116cba

Change-Id: I04cf92309e489b4304ca4f62c6ebce51489e5b9f
2019-04-03 09:40:15 -07:00
joker.yang
680a116cba Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720
am: 0e2559c2d6

Change-Id: I4e1f9781f903b4d3ef55b30b087c89126bc09db6
2019-04-03 09:24:30 -07:00
joker.yang
0e2559c2d6 Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility"
am: 78ec599720

Change-Id: I7c6759b45b8e7af3df7cf31288a9d484098704cf
2019-04-03 09:07:49 -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