Commit graph

70511 commits

Author SHA1 Message Date
Hidefumi Kaneko
9e571609f7 Fix typo for ODM prop files
_prop_files is missing a trailing _

Bug: 195034733
Test: manual - check that expected prop files are in the image
Change-Id: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
Merged-In: Ie042acc74fa56d5515cacd5f41ddc0f82d74f20c
2021-08-04 20:04:46 +00:00
Paul Scovanner
acc10d23e1 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: c2c92bc5c3 -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: Id998e7d3494e7f20ab5fe56ec26c3644017880ca
2021-06-15 06:30:05 +00:00
Paul Scovanner
0c8423765d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours am: 99c5b6455d -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I298831d046a3e68ed0015d07f730811577de9c44
2021-06-15 06:29:39 +00:00
Paul Scovanner
c2c92bc5c3 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I56feff4d4b4025cb6a97932ba81c37f51f670688
2021-06-15 06:17:15 +00:00
Paul Scovanner
99c5b6455d [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours am: 4c6a6534b5 -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I23c435730fd123c983d82dee6e83d7112d633615
2021-06-15 06:17:15 +00:00
Paul Scovanner
4c6a6534b5 [automerger skipped] Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b am: d4f2c30487 -s ours
am skip reason: Merged-In Ieba9625ca0ccedf285209954f1e766b20455c32f with SHA-1 f5139e3087 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: Ic14d7d2f3f00bc26d7ca45f5705e6b60eda6a04d
2021-06-15 06:07:41 +00:00
Paul Scovanner
d4f2c30487 Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a am: 2b5cc45a3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I83c72777cf01ff01eb99c08f48efa1522fb147e5
2021-06-15 05:52:10 +00:00
Paul Scovanner
2b5cc45a3b Update Security String to 2021-08-01 am: 719f8e6ff2 am: 731c612c5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: I43332aebc1ada9a38ea4896e3533d50c51b0871a
2021-06-15 05:39:05 +00:00
Paul Scovanner
731c612c5a Update Security String to 2021-08-01 am: 719f8e6ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14967096

Change-Id: Idbfb1d004c6dc78491713cdc5904463c3e4e33af
2021-06-15 05:26:37 +00:00
Jeff Sharkey
4ef2e34cb5 Merge "[DO NOT MERGE] platform/build/make - S is now REL" into sc-dev 2021-06-15 03:51:43 +00:00
Remi NGUYEN VAN
4ba373fe0f Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev 2021-06-15 02:05:19 +00:00
Paul Scovanner
2585969307 Update Security String to 2021-08-05 am: f5139e3087 am: 7d9208ac9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I48d91cf260c5b383baa9fde99c01d945977aea85
2021-06-14 22:02:03 +00:00
Paul Scovanner
073480991e Update Security String to 2021-08-05 am: f5139e3087 am: 7e1e5ad8ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Ifcfa2fd56abfd942b4af0a9a95e0150b95a0263f
2021-06-14 21:56:38 +00:00
Baligh Uddin
91b8435347 Merge "Handles capex in signing script" into sc-dev 2021-06-14 21:49:00 +00:00
Paul Scovanner
7d9208ac9f Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: I5766ee11c2b1717f0aedd4895ce01108687c7d6c
2021-06-14 21:39:09 +00:00
Paul Scovanner
7e1e5ad8ff Update Security String to 2021-08-05 am: f5139e3087
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14966269

Change-Id: Icbeccbd10e0496e7a38720f165b0868954939a51
2021-06-14 21:39:09 +00:00
Paul Scovanner
719f8e6ff2 Update Security String to 2021-08-01
Bug: 191053489
Change-Id: I704c163481698332aea96919eea01209acedb133
Merged-In: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 19:11:26 +00:00
Paul Scovanner
f5139e3087 Update Security String to 2021-08-05
Bug: 191053489
Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f
2021-06-14 18:53:26 +00:00
Remi NGUYEN VAN
45e403bd2e Use NetworkStack instead of NetworkStackNext
Now that NetworkStack has bumped its target SDK to 31, use it
instead of the development SDK NetworkStackNext binary.

In practice NetworkStack and NetworkStackNext are currently
identical, as "current" is now SDK 31 in S branches, and
NetworkStackNext does not contain any T-specific code yet.

This change should not be merged in development branches downstream of
AOSP.

Bug: 189581241
Test: device boots, has connectivity
Merged-In: Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5
Change-Id: I990c76da41d56c8756835b5743e1666d1382f796
2021-06-14 07:59:48 +00:00
Tianjie
579c347923 Handles capex in signing script
Today, the signing script simply ignores capex files, because it
looks for hardcoded '.apex' suffix. Add support to handle capex
as well.

Bug: 190574334
Test: Sign a target file locally
Change-Id: I3085ca7b0396a4fbf1b220f7de44d4eafb60c3d8
(cherry picked from commit 4d48d50036)
2021-06-12 18:13:59 +00:00
Jeff Sharkey
25d421446d [DO NOT MERGE] platform/build/make - S is now REL
Bug: 171506470
Test: Build
Change-Id: I98536ff83aab23cfaf5553a57a8a3b8264878847
2021-06-10 15:05:11 -06:00
Artur Satayev
7a7b416b81 Merge "Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk." into sc-dev 2021-06-10 12:15:24 +00:00
Julien Desprez
6f04506f42 [automerger skipped] [CP] Remove unit tests jar from suites am: 9a6e4270bc -s ours
am skip reason: Merged-In Ie808c7422e35c48c9392f7179806745ef392de64 with SHA-1 67e5ec6202 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910114

Change-Id: I963b2d70dd3ab85ba6bce6ca2f51d76b6d2e27a6
2021-06-09 17:03:56 +00:00
Jaegeuk Kim
6279b6c511 Merge "Missing required packages for f2fs when building ota package" into sc-dev 2021-06-09 16:50:29 +00:00
Jaegeuk Kim
01da65f93a Missing required packages for f2fs when building ota package
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
Merged-In: Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c
2021-06-09 02:11:23 +00:00
Julien Desprez
9a6e4270bc [CP] Remove unit tests jar from suites
Remove unit tests jar from official suite packaging
they will be run & tested externally as real unit tests.

Include the compatiblity-tradefed.jar element as it will
be needed.

Test: make cts; run cts-unit-tests
Bug: 173811050
Change-Id: Ie808c7422e35c48c9392f7179806745ef392de64
Merged-In: Ie808c7422e35c48c9392f7179806745ef392de64
2021-06-08 18:24:30 -07:00
satayev
66bb2ab32d Move PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS to default_art_config.mk.
The list of updatable system server jars must be known in
module_common.mk which is used to build mainline modules that contain
said system server jars.

module_common.mk inherit from default_art_config.mk.

Note that we could also move the defition into a separate make file,
if current change causes problems. However, places like clockwork
overwrite values of PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS instead
of appending to them, so it should not be a source of issues.

Bug: 180105615
Bug: 190407034
Test: TARGET_BUILD_VARIANT=user vendor/google/build/build_mainline_modules.sh -j64 and inspecting build artifacts
Change-Id: I771895bf0a974a4c6aa4f7374159c22536f03891
Merged-In: I771895bf0a974a4c6aa4f7374159c22536f03891
2021-06-08 15:40:22 +00:00
TreeHugger Robot
1efb38582a Merge "RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED" into sc-dev 2021-06-07 00:57:19 +00:00
Yuntao Xu
8c4997265a Merge "add LOCAL_DISABLE_TEST_CONFIG logic" into sc-dev 2021-06-04 16:51:28 +00:00
Jeongik Cha
5b1d149586 RRO shouldn't depend on frameworks or system(_ext) app when TARGET_BUILD_UNBUNDLED
In the case of unbundled build, the module in vendor should use
system(_ext) module by prebuilt one. But RRO depends on system module
directly depending on some conditions(packages exporting resources)

In this change,
 1. Temporarily make LOCAL_RES_LIBRARIES empty(For now, auto generated
 RRO doesn't use overlaid package's resources), enable it when prebuilts
 are ready.
 2. According to (1), its SDK_VERSION can be current)

Bug: 187404676
Test: TARGET_BUILD_UNBUNDLED_IMAGE m vendorimage, and check if there is
no build error regarding RRO.

Change-Id: I94e3122372dd20c942b2c858070a6ca797312792
Merged-In: I94e3122372dd20c942b2c858070a6ca797312792
(cherry picked from commit f93c13d51b)
2021-06-04 00:05:55 +00:00
Yuntao Xu
ee58bb67a5 add LOCAL_DISABLE_TEST_CONFIG logic
Disable the generation of .config file when the variable
LOCAL_DISABLE_TEST_CONFIG is true.

Bug: 188927912
Test: rum 'm module-name' (`android_test_helper_app` type module)
Test: TreeHugger
Change-Id: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
Merged-In: I64372b4ba84fcf1af937abdee345ceb1d3c2f6c5
2021-06-03 10:22:53 -07:00
Mohammad Samiul Islam
0e06c113f0 Merge "Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""" into sc-dev 2021-06-03 13:59:28 +00:00
Tianjie Xu
b195f48ce9 Merge "Check super size for factory OTA at build time" into sc-dev 2021-06-02 21:53:36 +00:00
Jeff Sharkey
83ecfb5073 Merge "platform/build/make - S is now 31" into sc-dev 2021-06-02 20:11:14 +00:00
Jeff Sharkey
fcc2b97e54 platform/build/make - S is now 31
Bug: 171506470
Test: Build
Change-Id: I1f3475479659855c0185236f88bc388a61844968
2021-06-02 10:19:19 -06:00
Jaegeuk Kim
bce364b9ce Merge changes from topic "f2fs-system" into sc-dev
* changes:
  Enable f2fs compression for other partitions
  Enable --readonly for system compression
2021-06-01 18:09:07 +00:00
Bowgo Tsai
22fb8a4709 Merge "Support AVB signing for BOARD_PREBUILT_BOOTIMAGE" into sc-dev 2021-05-28 00:35:40 +00:00
Paul Scovanner
f867606e12 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: 8a7f8d8d41 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: I1fcaac2e1ccef2b7d1676581ffe08fc55eea5d2f
2021-05-27 19:41:27 +00:00
Paul Scovanner
ab97d07c9e [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours am: ba62cd8b65 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Icfac32f812c1e6ba0c81e84d396bc34cb3a39880
2021-05-27 19:24:35 +00:00
Paul Scovanner
8a7f8d8d41 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Id10a547beac8f5617aedb7e49940dbd02326bb6a
2021-05-27 19:01:25 +00:00
Paul Scovanner
ba62cd8b65 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours am: 6972360246 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: I662ee93c4422095b0258b9fb9b36c4daad720ec3
2021-05-27 18:58:26 +00:00
Paul Scovanner
6972360246 [automerger skipped] Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033 am: 81fc2eda95 -s ours
am skip reason: Merged-In Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 with SHA-1 64b00db8f4 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: I4e539beb31b6713c28ded0589f03c23e549718d7
2021-05-27 18:32:35 +00:00
Paul Scovanner
81fc2eda95 Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae am: da50045033
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Ibbfcc175ace801307108d325035fcbcac2e81763
2021-05-27 18:06:25 +00:00
Paul Scovanner
da50045033 Update Security String to 2021-07-01 am: 5edc0cec47 am: d8033580ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: Ic69e33d14bfd68cd1bde31c774dacb92da50771f
2021-05-27 17:42:46 +00:00
Paul Scovanner
d8033580ae Update Security String to 2021-07-01 am: 5edc0cec47
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14694771

Change-Id: I1c3b7578852bee9c0d7a989d97ff6668a57ea2ee
2021-05-27 17:12:55 +00:00
Paul Scovanner
5edc0cec47 Update Security String to 2021-07-01
Bug: 188458861
Change-Id: I37f910ad48858038c97b86e2b04f9f3b9761c868
Merged-In: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708
2021-05-26 22:24:05 +00:00
Tianjie
16bcac122f Check super size for factory OTA at build time
For VAB launched device, factory OTA will write system_other
partition to the super image. So we want to check that
sum(dynamic partitions) + system_other + overhead <= super at
build time.

Since we don't know the overhead at build time, we might instead
check sum(all partitions) < super.

Bug: 185809374
Test: m check-all-partition-sizes, unittests
Change-Id: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
Merged-In: Ia7ba5999d23924a1927e9a9463856a4d0ea90c20
(cherry-picked from commit 294ec7d9e5)

Change-Id: I479d1b399a1639b595ae5d7f1481c771a3439e51
2021-05-26 14:43:35 -07:00
Jaegeuk Kim
91869cafe6 Enable f2fs compression for other partitions
Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I231f7a2b808cc792fd582cd444825e4a47722984
2021-05-26 13:11:28 -07:00
Jaegeuk Kim
028f6719f3 Enable --readonly for system compression
This option is to reduce system partition size.

Bug: 171942852
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Idc849cfce33ac0badb2b9b7953bb821c46a24472
2021-05-26 13:11:28 -07:00
TreeHugger Robot
e9e08e9e91 Merge "[memtag] Disable memtag for AndroidMk host modules." into sc-dev 2021-05-26 17:27:49 +00:00