Commit graph

58630 commits

Author SHA1 Message Date
Automerger Merge Worker
7aefdb1da1 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d am: 0c081b6d76
Change-Id: I5761a2cc1fe9b335d0eb80a52b4654fb1d2f68f1
2019-12-17 06:28:58 +00:00
Kiyoung Kim
2cf6c27240 Do not include linkerconfig for recovery
Linkerconfig should be built as static, but recovery does not have
enough space for static binary. As recovery linker configuration is
quite static and simple, this can be generated from build time. As a
first step linkerconfig binary should be removed from recovery.

Bug: 146384333
Test: m -j passed && crosshatch recovery worked with this change
Change-Id: Ie82da787424c5d1ddd2724808aa2323ea881f75b
2019-12-17 15:27:02 +09:00
Automerger Merge Worker
0c081b6d76 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" am: 2f4a8bb534 am: 23886a3c4d
Change-Id: I89e5e260944124823c3098ee42e693545c9c0aba
2019-12-17 06:14:22 +00:00
Yo Chiang
23886a3c4d Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI"""
am: 2f4a8bb534

Change-Id: I3ee8f69b34adca073f2dac31fb2c20b5d387ab10
2019-12-16 21:58:47 -08:00
Treehugger Robot
2f4a8bb534 Merge "Revert "Revert "Remove ro.apex.updatable=false in GSI""" 2019-12-17 05:51:34 +00:00
Automerger Merge Worker
74f58f3dc0 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16 am: dd779885eb
Change-Id: I6c0d26587bc7268ff4c9d2f074df290ff3880357
2019-12-17 05:24:53 +00:00
Automerger Merge Worker
dd779885eb Merge "Define PRODUCT_SYSTEM_* props for mainline_system" am: de5b0d2a73 am: 0ea258ae16
Change-Id: I341b3baed1b0e97b1fdb8f924d290c500b19428a
2019-12-17 05:13:12 +00:00
Yo Chiang
0ea258ae16 Merge "Define PRODUCT_SYSTEM_* props for mainline_system"
am: de5b0d2a73

Change-Id: Idd77cedb37c74801cdcd1744d06cfb72271a4303
2019-12-16 21:00:54 -08:00
Treehugger Robot
de5b0d2a73 Merge "Define PRODUCT_SYSTEM_* props for mainline_system" 2019-12-17 04:57:10 +00:00
Automerger Merge Worker
f2bc98d24f Update Security String to 2020-02-01 bug:146378789 am: 82e8e79390 am: dfbb15476f
Change-Id: Ibcea7df998f8852673f0695c7d8c3d69178035ce
2019-12-17 03:26:48 +00:00
Automerger Merge Worker
dfbb15476f Update Security String to 2020-02-01 bug:146378789 am: 82e8e79390
Change-Id: I9cae45d8b840964d52c56ce703ea3ff2c3225a36
2019-12-17 03:14:18 +00:00
Automerger Merge Worker
08d232cc8e [automerger skipped] Merge "Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID." into qt-qpr1-dev-plus-aosp am: f9d07beb96 -s ours
am skip reason: Change-Id I5c28225d61996cb719ae384d7b0828776e84f8d5 with SHA-1 eebe2d7cab is in history

Change-Id: Iae33a73b74472ff895588fd4947552893a47f87c
2019-12-17 01:33:43 +00:00
Xin Li
f9d07beb96 Merge "Make qt-qpr1-dev-plus-aosp use AOSP.MASTER as BUILD_ID." into qt-qpr1-dev-plus-aosp 2019-12-17 01:21:44 +00:00
Lubo Hristov
82e8e79390 Update Security String to 2020-02-01 bug:146378789 2019-12-16 16:05:44 -08:00
David Anderson
117b52f74e releasetools: Pass --virtual-ab to lpmake.
Note that we are currently excluding this flag for retrofit devices,
since it necessitates support for a newer super.img format, which
retrofit devices may not fully support.

Bug: 134949511
Test: m -j, lpdump super_empty.img
Change-Id: Id69a8d755b9f4c4bb5fbd456a416ced1a5f1d135
2019-12-16 22:17:28 +00:00
Martin Stjernholm
42ae1c8c8f Add libdl_android.so to the system partition absence check.
Test: m
Bug: 144343305
Change-Id: Ie3a9698d4d369a68ce2baffbab448af63ead4410
2019-12-16 21:43:45 +00:00
Automerger Merge Worker
1d6d18dc54 Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" am: 5c3bf1b164 am: 72c15268e2 am: 240c6bff1b
Change-Id: I3ed7051ccd412bc5f6125eab715bed55eb3e2946
2019-12-16 21:36:52 +00:00
Automerger Merge Worker
fe2248e753 [automerger skipped] Merge "Remove Soong intermediates after renaming core variant" am: 55406a8458 am: c37ff6ede2 am: d86ccbd3dc -s ours
am skip reason: Change-Id Ib10a9cf8a8c9109279523f811764afff34969368 with SHA-1 c9ea2ffc78 is in history

Change-Id: I5245b930a21c2fb89d7d167671bad7fe26bf7a31
2019-12-16 21:34:41 +00:00
Automerger Merge Worker
240c6bff1b Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" am: 5c3bf1b164 am: 72c15268e2
Change-Id: I3b34f3f1d1024d9ddc2105e253bee3af05bdfb5c
2019-12-16 21:22:55 +00:00
Automerger Merge Worker
d86ccbd3dc Merge "Remove Soong intermediates after renaming core variant" am: 55406a8458 am: c37ff6ede2
Change-Id: I71dbe7f8fbe30ced1fe1791c080e6bb2596a9930
2019-12-16 21:22:04 +00:00
Nick Desaulniers
72c15268e2 Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only"
am: 5c3bf1b164

Change-Id: Iabb1a11d75a243540052cfa973282ae77d747b68
2019-12-16 13:20:06 -08:00
Nick Desaulniers
5c3bf1b164 Merge "build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only" 2019-12-16 21:13:28 +00:00
Colin Cross
c37ff6ede2 Merge "Remove Soong intermediates after renaming core variant"
am: 55406a8458

Change-Id: Id9c7dccadeab083a5da852b7482d3f5f5525aafb
2019-12-16 13:06:06 -08:00
Treehugger Robot
55406a8458 Merge "Remove Soong intermediates after renaming core variant" 2019-12-16 20:54:32 +00:00
Muhammad Qureshi
6c351681a6 Merge "Add framework-statsd.jar to jars list" 2019-12-16 20:46:57 +00:00
Nick Desaulniers
9882f6f7be build: make: use -Wl,-z,separate-code w/ -Wl,--execute-only
Also, prefer
-Wl,--execute-only
rather than
-Wl,-execute-only

Bug: 139945549
Bug: 146144180
Test: m
Change-Id: I4a07978c7a84a0a7e841b9e059305b0f443d0e95
Suggested-by: Ryan Prichard <rprichard@google.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-12-16 09:55:05 -08:00
Kenny Root
785ab51913 Support Resume on Reboot
When an OTA is downloaded, the RecoverySystem can be triggered to store
the user's lock screen knowledge factor in a secure way using the
IRebootEscrow HAL. This will allow the credential encrypted (CE)
storage, keymaster credentials, and possibly others to be unlocked when
the device reboots after an OTA.

Bug: 63928581
Test: make
Change-Id: I6ae1d9e7cc3761fa8ddc02b64e357d08402f39e9
2019-12-16 09:28:50 -08:00
Lalit Maganti
ef70f3c92f Merge "build: enable Perfetto by default" 2019-12-16 16:41:49 +00:00
Automerger Merge Worker
8242f5e064 Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" am: 68209e4519 am: 0403c44566 am: b598202b3b
Change-Id: I4df0ac512d2b3729447b188f21031d71a92dc568
2019-12-16 15:43:17 +00:00
Automerger Merge Worker
b598202b3b Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" am: 68209e4519 am: 0403c44566
Change-Id: Idb2e33a16171cea6af44cd501c4f35ccdd73b81f
2019-12-16 15:29:57 +00:00
Automerger Merge Worker
ef4640cb48 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2 am: 423d1b9d7d
Change-Id: I13729fd18ec271739377ab3796a5b0ec66ab9cd8
2019-12-16 15:18:44 +00:00
Anton Hansson
0403c44566 Merge "Verify updatable jars are in PRODUCT_BOOT_JARS"
am: 68209e4519

Change-Id: I4227cb1b8f98761b228a9c112f32aa3e12d9208e
2019-12-16 07:18:22 -08:00
Lalit Maganti
37b5bf8aea build: enable Perfetto by default
Perfetto has been enabled by default on Pixel devices since P and has
proved to be stable and helped find performance issues on both P and Q.

On R+, iorapd has a dependency on Perfetto and thus we need to be enabled
by default.

Note that CTS tests have ensured that any downstream consumers of Android
have not accidentally broken Perfetto in old releases so this should be
safe to introduce and maintain going forward.

The two daemons of Perfetto (traced and traced_probes) are located on the
/system partition so for consistency, we have chosen to also enable the
build property on the system partition.

Googlers can see the below link for more context and detailed info.

Change-Id: I00fa7d4c97eda4d0ab83520d0f428bca83707d8a
Context (Googlers only): go/perfetto-by-default
Bug: 137963570
Test: checking product/build.prop in Treehugger builds
2019-12-16 15:15:29 +00:00
Anton Hansson
68209e4519 Merge "Verify updatable jars are in PRODUCT_BOOT_JARS" 2019-12-16 15:13:58 +00:00
Automerger Merge Worker
423d1b9d7d Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." am: ced27c4c60 am: 132c0346e2
Change-Id: Ib344bdc3dd9f3c1bd8816630adf16768ddc9bd12
2019-12-16 15:00:33 +00:00
Luke Huang
132c0346e2 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system."
am: ced27c4c60

Change-Id: I7a67c1cc12d432b7c7422d7184bf9f13db20c8aa
2019-12-16 06:48:35 -08:00
Luke Huang
ced27c4c60 Merge "Add com.android.cronet APEX and org.chromium.net.cronet to base_system." 2019-12-16 14:39:02 +00:00
Luke Huang
723ff8274d Add com.android.cronet APEX and org.chromium.net.cronet to base_system.
com.android.cronet will be shipped as a mainline
module in APEX format.

org.chromium.net.cronet is a java_sdk_library used to provide
Cronet API to apps.

Bug: 139397529
Test: Built and installed apex on device
Change-Id: Icff7ded02e360f2df9dfe3ac7185cf7f0034d014
2019-12-16 20:57:05 +08:00
Anton Hansson
37a037e05e Verify updatable jars are in PRODUCT_BOOT_JARS
A jar should never be in just the updatable list.

Test: treehugger
Change-Id: I806eb2d00502f98aa2c40fba3fc644cfddc64ad9
2019-12-16 11:27:18 +00:00
Yo Chiang
3bbbe2d5b9 Revert "Revert "Remove ro.apex.updatable=false in GSI""
This reverts commit c7f63dfeda.

Reason for revert: b/145963716

Change-Id: I0f6a9c26b342a27dfebc0494a255492c838c09f5
2019-12-16 08:38:59 +00:00
Bowgo Tsai
851f144d90 Adding developer_gsi_keys.mk
OEMs who are willing to support booting the public Developer-GSI
in locked state can add the following line into a device.mk to include
the corresponding public keys into their first-stage ramdisk.

   $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk)

Bug: 144399552
Test: make checks $OUT/ramdisk/avb/.
Change-Id: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
Merged-In: I8fdefa0fb26c2d385dda1f72503d12e6fc306694
(cherry picked from commit 01c6f6f215)
2019-12-16 14:49:42 +08:00
Sungsoo Lim
0a81ab7c66 Merge "Remove media command" 2019-12-16 06:40:53 +00:00
Automerger Merge Worker
8ec411e6cd Merge "Adding missing dependencies for vbmetaimage-nodeps" am: 8e3bc2d4ce am: 07e91398d7 am: 99b6d96da1
Change-Id: I534d5a5626b9602304eb03562f2e4e83b791c127
2019-12-16 05:29:45 +00:00
Automerger Merge Worker
99b6d96da1 Merge "Adding missing dependencies for vbmetaimage-nodeps" am: 8e3bc2d4ce am: 07e91398d7
Change-Id: Id65bbe27e3d128e0ae593552ee384143aef26287
2019-12-16 05:14:42 +00:00
Bowgo Tsai
07e91398d7 Merge "Adding missing dependencies for vbmetaimage-nodeps"
am: 8e3bc2d4ce

Change-Id: Iee7b6da732e95c6357f72c65a7deec1527a2eb4d
2019-12-15 21:04:57 -08:00
Treehugger Robot
8e3bc2d4ce Merge "Adding missing dependencies for vbmetaimage-nodeps" 2019-12-16 04:47:56 +00:00
Sungsoo Lim
96504cfeb5 Remove media command
Use media-session shell command instead.

Bug: 144453231
Test: manually
Change-Id: I69e877d25621d4f77f40a676d1511cbb9e6af83d
2019-12-16 11:17:26 +09:00
Yo Chiang
96949d3904 Define PRODUCT_SYSTEM_* props for mainline_system
These properties, namely:

- PRODUCT_SYSTEM_NAME
- PRODUCT_SYSTEM_BRAND
- PRODUCT_SYSTEM_MANUFACTURER
- PRODUCT_SYSTEM_MODEL
- PRODUCT_SYSTEM_DEVICE

propagate into /system/build.prop as ro.product.system.* and can
identify if the /system partition is mainline_system.
These don't modify other ro.product.* properties that are defined in
partitions other than /system.

Bug: 110206836
Bug: 146191296
Test: lunch mainline_system_arm64-userdebug; m
Test: lunch aosp_arm64-userdebug; m
Test: Two products must have same PRODUCT_SYSTEM_* props
Change-Id: I300579d555d269481635237fb02aab5db71a510d
2019-12-15 15:11:53 +00:00
TreeHugger Robot
5c0aa1b3ee Merge "Add vintf-common" 2019-12-15 08:40:32 +00:00
Automerger Merge Worker
5947d4ca60 Merge "Write list of copy headers" am: 6fe297fcc5 am: 3830d8ae0d am: 265572c081
Change-Id: Ifdd109d043b8a3ded7f1b51d45cb85ea08399201
2019-12-15 00:33:14 +00:00