Commit Graph

20491 Commits

Author SHA1 Message Date
android-build-team Robot
edfade219c Make change and version bump to QP1A.190527.001
Change-Id: Ia171033ea5baa789be272e96fe3db35d7a4e69b9
2019-05-26 23:19:21 +00:00
android-build-team Robot
53b09b43d0 Make change and version bump to QP1A.190526.001
Change-Id: I498bbc60a1a112b38c97aefd055bdf7f437acc7a
2019-05-25 23:20:55 +00:00
TreeHugger Robot
f862715103 Merge "Allow for the DTB image to be built by the Android build system." into qt-dev 2019-05-24 17:34:27 +00:00
android-build-team Robot
9466226aa7 Make change and version bump to QP1A.190523.001
Change-Id: I9537a35ec231ee533e9504e22ceff95410ede2d4
2019-05-23 03:17:15 +00:00
android-build-team Robot
1f08610bc2 Version bump to QP1A.190522.002 [core/build_id.mk]
Change-Id: I74a62fd102dc69ad65a7b6a491dfcc136947fd5d
2019-05-23 00:27:15 +00:00
Hridya Valsaraju
5b8f78fbe8 Allow for the DTB image to be built by the Android build system.
The current solution expects BOARD_PREBUILT_DTBIMAGE_DIR to
contain prebuilt DTB files that are concatenated by the build system
to create $OUT/dtb.img. In order to accommodate devices that build
the dtb image locally, when BOARD_PREBUILT_DTBIMAGE_DIR is undefined,
make boot.img creation depend only on $OUT/dtb.img.

Bug: 133161451
Test: Build with BOARD_PREBUILT_DTBIMAGE_DIR undefined and verify
using unpack_bootimg.py that $OUT/dtb.img was included in boot.img.

Change-Id: Iae2c634ccdc1d83589b26d382882f75fb8565a31
Merged-In: Iae2c634ccdc1d83589b26d382882f75fb8565a31
2019-05-22 15:55:47 -07:00
Bowgo Tsai
33ff602070 Moving /odm/build.prop to /odm/etc/buid.prop
In device root directory, we have the following symlinks:
  - /odm/app -> /vendor/odm/app
  - /odm/bin -> /vendor/odm/bin
  - /odm/etc -> /vendor/odm/etc
  ...

This allows the Generic System Image (GSI) to be used on both devices:
  1) Has a physical odm partition, where those symlink will be hidden
     when /odm is used as the mount point
  2) Has no physical odm partition and fallback to /vendor/odm/.

We can't just have the symlink /odm -> /vendor/odm, because the former
devices won't have /vendor/odm directory, which leads to mount failure
when the mount point /odm is resolved to /vendor/odm.

The existing /vendor/odm/build.prop won't be loaded in the latter
devices, because there is no symlink:
    - /odm/build.prop -> /vendor/odm/build.prop.

Note that init blocks reading through direct symlinks (O_NOFOLLOW) so
the above symlink won't work either. This CL moves the odm build.prop
to /odm/etc/build.prop for init to load it (symlinks in earlier
components of the path will still be followed by O_NOFOLLOW).

Bug: 132128501
Test: boot a device and checks /odm/etc/build.prop is loaded
Test: make dist with an odm.img, checks $OUT/odm/etc/build.prop is loaded
Change-Id: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
Merged-In: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
(cherry picked from commit 6c62884000)
2019-05-22 16:14:53 +08:00
android-build-team Robot
febea1fe3c Make change and version bump to QP1A.190522.001
Change-Id: I3c29339c46c616374f42a28227f8939538afd128
2019-05-22 03:18:34 +00:00
android-build-team Robot
93b5c6f6ec Version bump to QP1A.190521.003 [core/build_id.mk]
Change-Id: I1355875cfb6031db81bb8583fc0a8b8e5075597f
2019-05-21 23:43:22 +00:00
android-build-team Robot
70e0d45460 Version bump to QP1A.190521.002 [core/build_id.mk]
Change-Id: I54826aa07647b348977ff78705495415d8175356
2019-05-21 18:10:37 +00:00
android-build-team Robot
87d036cc4a Make change and version bump to QP1A.190521.001
Change-Id: I30283d61a2507767a655620ae232a7e1ba077388
2019-05-21 03:17:50 +00:00
android-build-team Robot
8a30b46910 Version bump to QP1A.190520.002 [core/build_id.mk]
Change-Id: I74f6e060d56f40acf8eb29c6cecd78ca47713698
2019-05-20 21:08:00 +00:00
android-build-team Robot
ed0f3a5468 Make change and version bump to QP1A.190520.001
Change-Id: I96329f3116b1e61766efb56b5be713f99fab9fd4
2019-05-19 23:18:32 +00:00
android-build-team Robot
c38d512152 Make change and version bump to QP1A.190519.001
Change-Id: Id824972c43b186712a0b38f555d7a03aa1104f98
2019-05-18 23:19:56 +00:00
android-build-team Robot
fe6a175a40 Version bump to QP1A.190516.006 [core/build_id.mk]
Change-Id: I035cc11262d70db71698af3b55f320a4009a5de0
2019-05-18 00:03:09 +00:00
android-build-team Robot
70995c830e Version bump to QP1A.190516.005 [core/build_id.mk]
Change-Id: Iaf1b466e5322ba7e4860c1736271746589b79cfc
2019-05-17 22:43:31 +00:00
android-build-team Robot
ac6863a9e4 Version bump to QP1A.190516.004 [core/build_id.mk]
Change-Id: I5afaf455c57c241100cba488b340231c02e6dcc1
2019-05-17 21:59:48 +00:00
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
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
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
Anton Hansson
43b86c0182 Merge "Move default setting of a product variable" into qt-dev 2019-05-16 09:27:29 +00: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
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
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
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
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
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
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
android-build-team Robot
eb35544120 Make change and version bump to QP1A.190514.001
Change-Id: I274193cbaccbd33169c49b5c04bf344529b5d926
2019-05-14 03:17:27 +00:00
Paul Scovanner
0718f458a1 Update Security String to 2019-07-05
Bug:132634503
2019-05-14 00:02:43 +00:00
Paul Scovanner
95bee0f53e Update Security String to 2019-07-01
Bug:132634503
2019-05-13 20:36:29 +00:00
android-build-team Robot
1059bf1354 Make change and version bump to QP1A.190513.001
Change-Id: Ic5c14709671718aae23779b0477632e1dc04f2d4
2019-05-12 23:19:01 +00:00
android-build-team Robot
ab89654a1f Make change and version bump to QP1A.190512.001
Change-Id: Ia9c366ed1920aba62675d517e44a61c2dc5d465e
2019-05-11 23:21:27 +00:00
Ian Pedowitz
bed3e5262e 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
2019-05-11 10:01:39 -07:00
Ian Pedowitz
883ad4c8b2 Android Q is now REL
Bug: 129943426
Test: Build
Change-Id: I99d58a4afeaf38c51a93cc95d9ea1f5666797602
Merged-In: I352e02484fa73ee924c84846913b93f7713c77ef
2019-05-11 08:33:31 -07:00
android-build-team Robot
c19f3063b0 Version bump to QP1A.190509.006 [core/build_id.mk]
Change-Id: Ibc51026abe6915393fe322ee44caeddb541b13e9
2019-05-10 19:03:05 +00:00
Martin Stjernholm
6311b83cc2 Extend library absence check to Bionic libs and all ART debug libs.
(cherry picked from commit c2e0205927)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I1a25d8d45668638b7eb0d39ded9cad3ed30db33c
Change-Id: I5b89aa33d35022fdca7f19c98f1bae51c173a876
2019-05-10 16:14:58 +00:00
Martin Stjernholm
e954e3e47d Add the library absence check as a kati stage check.
(cherry picked from commit a5181f67a7)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I7a93cc0ac4480404a3d56c75eb43ae499e8a3a05
Change-Id: I6012e16bb02d4fea1cff51b20de94560da7a8d09
2019-05-10 16:14:50 +00:00
Martin Stjernholm
4c62151f8e Add libs that have been resolved to the library absence check.
(cherry picked from commit 7a2dde8bd5)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I9e517d3c2344b39cf2743a34723572e646675677
Change-Id: Id39a947c1522cf3a226ff1a4430c57bf7d861141
2019-05-10 16:14:29 +00:00
Martin Stjernholm
4a901c6d41 Ignore vndk-* subdirectories in the library absence check.
(cherry picked from commit 8222ce45dd)

Test: m systemimage
Test: build_test on Forrest
Bug: 132289438
Merged-In: I059c9d0edb78e52838a25cef0472807847d77417
Change-Id: I57359dc9f1aa2230acd3252118aaf41f42b7a913
2019-05-10 16:14:20 +00:00