Commit Graph

21590 Commits

Author SHA1 Message Date
android-build-team Robot
e1639dd50c Version bump to QP1A.190516.003 [core/build_id.mk]
Change-Id: I50ee056d9ee488afa692bdd782a4d505a7239b9a
2019-05-17 01:50:17 +00:00
patricktu
ab435e39a5 AIDEGen: Collect the srcjar path of modules into module-info.json
By design doc: go/aidegen-doc-generate-R
In order to generate R.java of app modules, AIDEGen needs to build
the module. It might cause system.img oversized so we turn to build
the target srcjar file if it exists in module-info.json.

Build module-info.json without this change:
Build time: 1m47.227s
File size: 14,186,429 Bytes

Build module-info.json with this change:
Build time: 1m46.796s
File size: 14,614,470 Bytes

Bug: 132407603
Test: 1. m out/target/product/generic_x86_64/module-info.json
      2. by grep "target/common/obj/APPS/Settings_intermediates/aapt2.srcjar"
         in module-info.json.

Change-Id: I09c812aede0324bc38acbead0a863a85ae15b33e
2019-05-17 01:46:56 +00:00
android-build-team Robot
3fac868176 Version bump to QP1A.190516.002 [core/build_id.mk]
Change-Id: I702b70ed804b60168fd0d201d3c2572ac611aa93
2019-05-17 01:19:31 +00:00
Xin Li
4534fcca85 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master." 2019-05-17 00:58:10 +00:00
Bowgo Tsai
ce8b063507 Appending per-partition os_version into AVB props
os_version is important for keymaster version binding, where it
refuses to perform operations with a key that is bound to an old
system version.  This ensures that an attacker who discovers a
weakness in an old version of system or TEE software cannot roll a
device back to the vulnerable version and use keys created with the
newer version.

Previously, os_version for system.img is added into boot.img header
for bootloader to read the value then pass to TEE before booting the
HLOS. However, with project Treble to modularize each partition, all
images are now in the trajectory to be built independently (still
on-going). Also, in the Generic System Image (GSI) compliance test,
the os_version in OEM's boot.img cannot reflect the actual version of
GSI.

This CL adds per-partition os_versions into AVB metadata, which is
readable by bootloader via libavb without file system dependency. It's
still unclear for how os_version in non-system partition should be used.
We just add them for completeness here.

See more details in:
https://source.android.com/security/keystore/version-binding

Bug: 132233601
Test: build and avbtool info_image $OUT/vbmeta.img
      - Prop: com.android.build.boot.os_version -> '10'
      - Prop: com.android.build.system.os_version -> '10'
      - Prop: com.android.build.system.security_patch -> '2019-06-05'
      - Prop: com.android.build.vendor.os_version -> '10'
      - Prop: com.android.build.vendor.security_patch -> '2019-06-05'
      - Prop: com.android.build.product.os_version -> '10'
      - Prop: com.android.build.product.security_patch -> '2019-06-05'

Change-Id: I21a77420f2e8a3456f7a8cae5158eb8fc41319e7
Merged-In: I21a77420f2e8a3456f7a8cae5158eb8fc41319e7
(cherry picked from commit 9b54801b58)
2019-05-16 21:46:53 +08:00
Justin Yun
c859b0a6b2 Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS" am: 2faec12c07
am: 916b368b2f

Change-Id: I83f2a5b53d0bd53aef74b72c7e4f515907d85b63
2019-05-16 06:31:48 -07:00
Justin Yun
916b368b2f Merge "Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS"
am: 2faec12c07

Change-Id: I97b262be7c4947b08914eb0d2a1fbf8db902b38d
2019-05-16 06:26:37 -07:00
Justin Yun
9d608dc541 Allow overriding PRODUCT_EXTRA_VNDK_VERSIONS
As a PRODUCT variable, PRODUCT_EXTRA_VNDK_VERSIONS is not allowed to
be assigned from the build command. Instead, we can use
OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS in the build command to
override PRODUCT_EXTRA_VNDK_VERSIONS.

Bug: 132412510
Test: OVERRIDE_PRODUCT_EXTRA_VNDK_VERSIONS=28 m vndk_snapshot_package
Change-Id: I91579961ab393f40ddce8bfe9304829b5b669441
2019-05-16 13:12:55 +00:00
Bowgo Tsai
813f0a975c Merge "Appending per-partition os_version into AVB props" am: 196f64bc6b
am: 5aa1aecc21

Change-Id: Ia1aa5965dfa03403f3bab5ea1acc42fbe6d9e113
2019-05-16 04:44:36 -07:00
Bowgo Tsai
5aa1aecc21 Merge "Appending per-partition os_version into AVB props"
am: 196f64bc6b

Change-Id: Iab23dbb438cda078ac44cf569939f54db0663e95
2019-05-16 04:39:30 -07:00
Treehugger Robot
196f64bc6b Merge "Appending per-partition os_version into AVB props" 2019-05-16 11:27:31 +00:00
Anton Hansson
6ea18292dc Add more colors to generated product graphs
Color the node nodes by their location to:
- /build/make/target/product/* => light yellow
- /vendor/* => light red

Test: m product-graph
Change-Id: I911764352e7dc4e2ead2b3770300f48d23dc20b8
2019-05-16 11:09:57 +01:00
Anton Hansson
43b86c0182 Merge "Move default setting of a product variable" into qt-dev 2019-05-16 09:27:29 +00:00
Bowgo Tsai
9b54801b58 Appending per-partition os_version into AVB props
os_version is important for keymaster version binding, where it
refuses to perform operations with a key that is bound to an old
system version.  This ensures that an attacker who discovers a
weakness in an old version of system or TEE software cannot roll a
device back to the vulnerable version and use keys created with the
newer version.

Previously, os_version for system.img is added into boot.img header
for bootloader to read the value then pass to TEE before booting the
HLOS. However, with project Treble to modularize each partition, all
images are now in the trajectory to be built independently (still
on-going). Also, in the Generic System Image (GSI) compliance test,
the os_version in OEM's boot.img cannot reflect the actual version of
GSI.

This CL adds per-partition os_versions into AVB metadata, which is
readable by bootloader via libavb without file system dependency. It's
still unclear for how os_version in non-system partition should be used.
We just add them for completeness here.

See more details in:
https://source.android.com/security/keystore/version-binding

Bug: 132233601
Test: build and avbtool info_image $OUT/vbmeta.img
      - Prop: com.android.build.boot.os_version -> '10'
      - Prop: com.android.build.system.os_version -> '10'
      - Prop: com.android.build.system.security_patch -> '2019-06-05'
      - Prop: com.android.build.vendor.os_version -> '10'
      - Prop: com.android.build.vendor.security_patch -> '2019-06-05'
      - Prop: com.android.build.product.os_version -> '10'
      - Prop: com.android.build.product.security_patch -> '2019-06-05'

Change-Id: I21a77420f2e8a3456f7a8cae5158eb8fc41319e7
2019-05-16 12:56:41 +08:00
android-build-team Robot
a745edad09 Make change and version bump to QP1A.190516.001
Change-Id: I0ba3452cad0b305e7a43a36f52381d21aecf2c34
2019-05-16 03:17:32 +00:00
android-build-team Robot
f92632ca48 Make change and version bump to QP1A.190515.003
Change-Id: I412aa222b1963d0e13705eef010de9ac31c719ff
2019-05-16 00:17:01 +00:00
Ian Pedowitz
65f0dbbd7a Revert "Revert "Updating the platform sdk version for Q""
This reverts commit 842119ab3a.

Reason for revert: Rolling forward for Q-Finalization

Bug: 129975435
Bug: 129943426
Test: Build
Change-Id: I651e3ec68a765d3867be5341751cd536ccbe604a
(cherry picked from commit bed3e5262e)
2019-05-15 23:02:54 +00:00
Ian Pedowitz
16c89dcec2 Android Q is now REL
Bug: 129943426
Test: Build
Change-Id: I99d58a4afeaf38c51a93cc95d9ea1f5666797602
Merged-In: I352e02484fa73ee924c84846913b93f7713c77ef
(cherry picked from commit 883ad4c8b2)
2019-05-15 23:02:46 +00:00
TreeHugger Robot
4dae317ace Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master" into stage-aosp-master 2019-05-15 23:02:16 +00:00
Inseob Kim
43f0db0fa0 Merge "Generate VNDK snapshot with Soong except configs" am: 85fba4c04a
am: 1d61f54039

Change-Id: I1b4bbaa7bf30fd3f75e8c78868ce32f5692a0806
2019-05-15 15:38:00 -07:00
android-build-team Robot
300683a125 Version bump to QP1A.190515.002 [core/build_id.mk]
Change-Id: Ib0f96f3c288e7ecda70cc961228a38d3246e1ccc
2019-05-15 22:24:12 +00:00
Treehugger Robot
85fba4c04a Merge "Generate VNDK snapshot with Soong except configs" 2019-05-15 22:13:35 +00:00
Ian Pedowitz
c0183e5b70 Merge "Revert "Revert "Updating the platform sdk version for Q""" into qt-dev
am: 122a1136e6

Change-Id: Idaa679084002b521a5ae5652378e9922d17365e8
2019-05-15 13:15:05 -07:00
Ian Pedowitz
122a1136e6 Merge "Revert "Revert "Updating the platform sdk version for Q""" into qt-dev 2019-05-15 16:28:53 +00:00
Ian Pedowitz
89e4c9da7a Merge "Android Q is now REL" into qt-dev 2019-05-15 16:28:53 +00:00
Martin Stjernholm
68b887c8fe Merge "Add libc_malloc_{debug,hooks}.so to the absence check." am: e51a7282b5
am: cc9253a650

Change-Id: I2be7c96eb21755c0dc92ac417f5fbc404e605817
2019-05-15 04:04:12 -07:00
Anton Hansson
ce92218748 Merge "Make implicit 32-bit apps on 64-bit target an error" am: 3163453d0a
am: 5c5ea6d31a

Change-Id: Ia0ab20610716b01f7b1d36a8daf8fe3a64ca40c5
2019-05-15 04:03:14 -07:00
Treehugger Robot
e51a7282b5 Merge "Add libc_malloc_{debug,hooks}.so to the absence check." 2019-05-15 10:47:49 +00:00
Anton Hansson
db8bfbd361 Merge "Move default setting of a product variable" am: b35b427769
am: 3e554c3973

Change-Id: Icdcaf620d8750c664eb33006589d08035ce2f65f
2019-05-15 03:45:13 -07:00
Anton Hansson
3163453d0a Merge "Make implicit 32-bit apps on 64-bit target an error" 2019-05-15 10:44:31 +00:00
Anton Hansson
584d3726b6 Move default setting of a product variable
Should be in product_config.mk, before the variables are readonly'd, or
the default will fail to work.

(cherry picked from commit 269dd013a5)

Bug: 131576555
Test: set PRODUCT_SHIPPING_API_LEVEL := 29 in mainline_arm64.mk && lunch
Change-Id: I25faee7ec0a3fff17e1d08b834d868834effda36
Merged-In: I25faee7ec0a3fff17e1d08b834d868834effda36
2019-05-15 11:30:29 +01:00
Anton Hansson
b35b427769 Merge "Move default setting of a product variable" 2019-05-15 10:29:54 +00:00
android-build-team Robot
90c61dbdcd Make change and version bump to PQ3B.190701.001
Change-Id: I905edbf8403c46f5ae4d9de8bf65188626c3bab5
2019-05-15 05:37:32 +00:00
Paul Scovanner
753c431ce4 Update Security String to 2019-07-01
Bug:132634503
(cherry picked from commit 95bee0f53e)

Change-Id: Ib6e10423216a15e930461317296a748064dc4055
2019-05-15 05:31:48 +00:00
android-build-team Robot
ae0c0b156c Make change and version bump to QP1A.190515.001
Change-Id: I79672c650805a07d8f7b21e7ff41ab04ff04aa5d
2019-05-15 03:22:23 +00:00
Paul Scovanner
443a758245 Update Security String to 2019-07-05 Bug:132634503 am: 0718f458a1 am: 67f7ba7d9c am: 2ec2e55239 am: f01785c0a8
am: 2813ebc21d

Change-Id: I557bcb3353819773b2d5ecff88945a33be0b6114
2019-05-14 15:31:11 -07:00
Paul Scovanner
2813ebc21d Update Security String to 2019-07-05 Bug:132634503 am: 0718f458a1 am: 67f7ba7d9c am: 2ec2e55239
am: f01785c0a8

Change-Id: I92f844d235420335ccd7a29a07b8d6ea9757fedd
2019-05-14 15:03:19 -07:00
Paul Scovanner
f01785c0a8 Update Security String to 2019-07-05 Bug:132634503 am: 0718f458a1 am: 67f7ba7d9c
am: 2ec2e55239

Change-Id: I1164c5fd489d282c2c297c78e59a3d937adb4e2f
2019-05-14 14:59:06 -07:00
Paul Scovanner
2ec2e55239 Update Security String to 2019-07-05 Bug:132634503 am: 0718f458a1
am: 67f7ba7d9c

Change-Id: Id153c7f78dcf9cb5f0aacf261837bff9844f9cbf
2019-05-14 14:52:55 -07:00
Paul Scovanner
67f7ba7d9c Update Security String to 2019-07-05 Bug:132634503
am: 0718f458a1

Change-Id: Ice3a0dc3f425217138d881543aaae1c4c412d7db
2019-05-14 14:45:50 -07:00
android-build-team Robot
069edaa14a Make change and version bump to PQ3A.190705.001
Change-Id: I45e031eeec35f166e782f241967e600200743f24
2019-05-14 19:55:37 +00:00
Paul Scovanner
21437e6584 Update Security String to 2019-07-05
Bug:132634503
(cherry picked from commit 0718f458a1)

Change-Id: I181facdc75f60ac225d682075e338c64a2cf0c42
2019-05-14 19:51:49 +00:00
Paul Scovanner
581b56e0a2 Update Security String to 2019-07-01 Bug:132634503 am: 95bee0f53e am: 2f15ff97b7 am: 58c2ebf84b am: d51234a521
am: 3caec84292

Change-Id: I64a8847d5ad50456e3891cdab3751884f6cf23d7
2019-05-14 11:38:51 -07:00
Paul Scovanner
3caec84292 Update Security String to 2019-07-01 Bug:132634503 am: 95bee0f53e am: 2f15ff97b7 am: 58c2ebf84b
am: d51234a521

Change-Id: I713c98262d85d9dfac5e372284f9f93e7dbce7d9
2019-05-14 11:23:11 -07:00
Paul Scovanner
d51234a521 Update Security String to 2019-07-01 Bug:132634503 am: 95bee0f53e am: 2f15ff97b7
am: 58c2ebf84b

Change-Id: Ic30bcfffb5ff71afd8d59fe9cfb1a0402b55c4c3
2019-05-14 11:18:01 -07:00
Paul Scovanner
58c2ebf84b Update Security String to 2019-07-01 Bug:132634503 am: 95bee0f53e
am: 2f15ff97b7

Change-Id: I7a8fabadfa32356443305953ec91665037f7aa28
2019-05-14 11:10:59 -07:00
Paul Scovanner
2f15ff97b7 Update Security String to 2019-07-01 Bug:132634503
am: 95bee0f53e

Change-Id: If6ac58537bc1e8359a0774a5dd9513813900a6c2
2019-05-14 11:04:42 -07:00
Martin Stjernholm
ff29b0fa3e Add libc_malloc_{debug,hooks}.so to the absence check.
They should only be in the Runtime APEX, c.f. discussion on
http://r.android.com/957159.

Test: build/soong/build_test.bash through Forrest
Bug: 124293228
Change-Id: I33e97a56e67c3f4734d14f38e0f1597b697a2604
2019-05-14 18:37:40 +01:00
Anton Hansson
d562942793 Merge "Make PRODUCT_CHARACTERISTICS a single-valued variable" am: 87c470e127
am: 01f7c9162b

Change-Id: I7babb8330e0b2d6e500b6684f3f1f5f4fee8a9a7
2019-05-14 09:07:33 -07:00
Anton Hansson
269dd013a5 Move default setting of a product variable
Should be in product_config.mk, before the variables are readonly'd, or
the default will fail to work.

Bug: 131576555
Test: set PRODUCT_SHIPPING_API_LEVEL := 29 in mainline_arm64.mk && lunch
Change-Id: I25faee7ec0a3fff17e1d08b834d868834effda36
2019-05-14 14:33:18 +01:00