Commit Graph

52344 Commits

Author SHA1 Message Date
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
Paul Scovanner
bf5bc0bbb5 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c am: b293d74a3c am: c7c7763e18
am: ac3ae589d5

Change-Id: Ib876f29c2c0358e0b32cd93207044f74ca3def40
2019-04-09 17:14:14 -07:00
Paul Scovanner
1350102c53 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7 am: 9231b34069 am: ee14e56c76 -s ours
am: 91441ca650 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib50a27beb3a876d1a48ef801f6afd7cdbc204aea
2019-04-09 17:11:40 -07:00
Paul Scovanner
ac3ae589d5 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c am: b293d74a3c
am: c7c7763e18

Change-Id: Ib492d6c7909b92d07da1c9cb406deeac9094b162
2019-04-09 15:46:01 -07:00
Paul Scovanner
91441ca650 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7 am: 9231b34069
am: ee14e56c76 -s ours
am skip reason: subject contains skip directive

Change-Id: I270f4711add802057ccd3fe0327ca5691ea62a5a
2019-04-09 15:44:39 -07:00
Paul Scovanner
c7c7763e18 Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev am: e95d55db1c
am: b293d74a3c

Change-Id: I5312b7e1ff9d3558ab9c051dc34ab34ff9c4ea92
2019-04-09 14:22:23 -07:00
Paul Scovanner
ee14e56c76 [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 Merged-In:1f8f84de6133f82df8210fa9214475d7c5aaa2f0 am: 3e8a1393a7
am: 9231b34069

Change-Id: Iee0d3857d653ffed9888b742535008c781577adc
2019-04-09 14:21:09 -07: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
b293d74a3c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
am: e95d55db1c

Change-Id: Ie4e72858b9c41aedad54b82f4b65289132370c10
2019-04-09 13:22:43 -07:00
Paul Scovanner
0c72cb3937 [automerger skipped] Merge "[DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896" into pi-dev
am: 0ad5c1fe8b -s ours
am skip reason: subject contains skip directive

Change-Id: If61d08f5e3bd12ef57b5526364db49eeef9bf7b8
2019-04-09 13:17:43 -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
e95d55db1c Merge changes from topic "am-25a1f704-80e7-4c0b-a6ef-9bda09527573" into oc-dev
* changes:
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
  [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
  [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
2019-04-09 18:54:57 +00:00
Paul Scovanner
0ad5c1fe8b Merge "[DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896" into pi-dev 2019-04-09 18:50:22 +00: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
509fb24dcd Merge "Move bootimage props to vendor/build.prop" into qt-dev 2019-04-09 16:47:48 +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
Anton Hansson
4844d4f3c7 Enable JIT Zygote experiment in mainline boardconfig
Like Ie413f84c545c869ee336912a7b05ca80bb968129, but for all
mainline devices.

Bug: 119800099
Test: m
Change-Id: Ief77adaea61203a013f85cf870c5350253fdb7dd
Merged-In: Ief77adaea61203a013f85cf870c5350253fdb7dd
2019-04-09 13:02:44 +01:00
Mathieu Chartier
d31e4a9f85 Merge "Revert "Turn off app image startup cache temporarily"" into qt-dev 2019-04-08 23:20:08 +00:00
Paul Scovanner
63547acb5f [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: 1f8f84de61 -s ours
am: 9c6046fb32 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1efa4bc705a7d6a133f35f3e55aa4ee5056befc
2019-04-08 15:13:22 -07: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
9c6046fb32 [automerger skipped] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896
am: 1f8f84de61 -s ours
am skip reason: subject contains skip directive

Change-Id: I4dadebf0c3215c7c3aa8ec019d2cccdf8e5c6b07
2019-04-08 14:34:03 -07: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
Mathieu Chartier
39adb5535d Revert "Turn off app image startup cache temporarily"
This reverts commit 8ef74918a9.

Bug: 128941180
Test: TH

Reason for revert: Regressions are mostly fixed

Change-Id: I4bef949b4ac9b11523482c6714345a250c11573a
2019-04-05 15:58:55 -07:00
Android Build Merger (Role)
c9025d9833 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a skipped: 04ba31ff57
Change-Id: I465e072206cdc9727df1d7cd1f71b4f8f5ef7d38
2019-04-05 21:22:23 +00:00
Android Build Merger (Role)
04ba31ff57 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea am: ef4f971f0a
Change-Id: I6e36aef2c3c3307fcf2a34d5b71dccae5fb217a1
2019-04-05 21:22:21 +00:00
Android Build Merger (Role)
ef4f971f0a [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648 am: 41611b89ea
Change-Id: I85f6511f1258aa33b9df20c42d58ea624a95130e
2019-04-05 21:22:19 +00:00
Android Build Merger (Role)
41611b89ea [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a am: f3e105e648
Change-Id: I107595082da3470de9968e54ed4439ec4ca1e7da
2019-04-05 21:22:17 +00:00
Android Build Merger (Role)
f3e105e648 [automerger] [DO NOT MERGE] Update Security String to 2019-06-01 Bug:129374896 am: bcdb638d6a
Change-Id: If24a508f5a46ac7b82458721ab5b715d7c863dc7
2019-04-05 21:22:15 +00:00
Paul Scovanner
bcdb638d6a [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 21:22:12 +00:00
Lajos Molnar
953dc98790 Merge "allow actually 140MB vendor partition space" into qt-dev 2019-04-05 18:09:36 +00:00
Lajos Molnar
6c95d826e8 Merge "media: remove soft OMX components from VNDK" into qt-dev 2019-04-05 18:09:36 +00:00
Nicolas Geoffray
e4f1911328 Merge "Pass DEXPREOPT_USE_APEX_IMAGE to soong." into qt-dev 2019-04-05 16:24:27 +00:00
Anton Hansson
0e3a76e755 Merge "Move device-specific vars from mainline common" into qt-dev 2019-04-05 16:01:34 +00:00
Lajos Molnar
827c189e1b Merge "media: move com.android.media.swcodecs to base_system.mk." into qt-dev 2019-04-05 13:34:29 +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