Commit Graph

70486 Commits

Author SHA1 Message Date
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
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 f93c13d51bff2478d4bcf48c808bc78a5ce0b989)
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 294ec7d9e5298d91768e0f2e9abe4cc7de180fe1)

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
Mohammad Islam 4a1240de8a Revert "Revert "Re-land "Enable apex compression on all devices with updatable apex""
This reverts commit b695e761f1.

Reason for revert: b/185708645 has been fixed

Bug: 169780183
Bug: 185708645
Change-Id: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Merged-In: If0ea1168c710eeb4c90d7a9768a278a07adc48fa
Test: Manually updated APEX with same version via OTA/adb-remount and observed it was decompressed.
2021-05-26 18:21:36 +01:00
Mitch Phillips fe35441af5 [memtag] Disable memtag for AndroidMk host modules.
BUILD_HOST_EXECUTABLE modules are substantially deprecated, but some
partners are still using them for their bits with the workaround
provided in the product definition. This fixes a build error where
the host module doesn't have a linkable ELF note archive.

MTE is not intended for host modules, and it's fine for us to say
"host module using AndroidMk - no MTE for you" if this changes.

Bug: 189330992
Test: Manually tested using a BUILD_HOST_EXECUTABLE module.
Change-Id: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
Merged-In: Ifedff39f2f03c08bfb644221d2ab1b88e635c8a3
2021-05-26 17:07:27 +00:00
Bowgo Tsai b23656df31 Support AVB signing for BOARD_PREBUILT_BOOTIMAGE
Devices using GKI architecture will use a prebuilt boot.img.
However, we should still sign this prebuilt boot.img with
device-specific AVB keys.

Steps to test the CL.
1. In a device BoardConfig.mk:

   # Uses a prebuilt boot.img
   TARGET_NO_KERNEL := true
   BOARD_PREBUILT_BOOTIMAGE := device/google/redbull/boot.img

   # Enable chained vbmeta for the boot image.
   # The following can be absent, where the hash descriptor of the
   # 'boot' partition will be stored then signed in vbmeta.img instead.
   BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
   BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
   BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
   BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2

2. `make bootimage`, then `avbtool info_image --image $OUT/boot.img`,
    checks the image is re-signed with a device-specific key

3. `make dist` to generate out/dist/TF.zip

4. `unzip out/dist/TF.zip IMAGES/boot.img`

5. `avbtool info_image --image out/dist/IMAGES/boot.img`,
    checks the image is re-signed with a device-specific key

6. `sign_target_files_apks \
      --avb_boot_key=external/avb/test/data/testkey_rsa8192.pem \
      --avb_boot_algorithm=SHA256_RSA8192 \
      --avb_boot_extra_args="--prop test:sign" \
      ./out/dist/*-target_files-eng.*.zip signed.zip`, resign the TF.zip

7. `unzip signed.zip IMAGES/boot.img`, then use `avbtool info_image` to
   check the boot.img is re-signed with the --avb_boot_key in step 6.

Bug: 188485657
Test: above steps
Change-Id: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
Merged-In: I7ee8b3ffe6a86aaca34bbb7a8898a97b3f8bd801
(cherry picked from commit cf9ead8972dd2b7c90772b6a1fd26bd4311a7c74)
2021-05-26 09:11:00 +08:00
Jiyong Park 33e79ba41e Merge "Updated vndk library list after aidl-freeze-api" into sc-dev 2021-05-25 22:43:41 +00:00
Christian Wailes dee08a8473 Merge "RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."" into sc-dev 2021-05-24 22:39:02 +00:00
Calin Juravle c55bf19bd6 Merge "Add pm.dexopt.cmdline mapping in product config" into sc-dev 2021-05-24 21:34:29 +00:00
Chris Wailes 58a82ce77f RESTRICT AUTOMERGE: Revert "Add the service-art JAR to the System Server classpath."
This reverts commit efe5ca180c.

Test: m
Bug: 184281926
Change-Id: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
Merged-In: Ibbea99fe93010c52f7cdf601b1e361ce2076b83c
2021-05-24 20:29:15 +00:00
TreeHugger Robot 63383e9d75 Merge "Add GKI to generic x86_64 board" into sc-dev 2021-05-24 17:49:03 +00:00
TreeHugger Robot 54cb463cce Merge "Move GKI common settings to BoardConfigGkiCommon.mk" into sc-dev 2021-05-24 17:48:59 +00:00
TreeHugger Robot 8397a81680 Merge "Disable <uses-library> checks for more tests (to fix MTS builds)." into sc-dev 2021-05-24 17:28:30 +00:00
Calin Juravle 2a3110cd73 Add pm.dexopt.cmdline mapping in product config
Test: boot
Bug: 188655918
Merged-In: I527a71d0acec0ba6593b2da1fd13818cba3b4832
(cherry picked from commit ccb4cdc7f6c0b2037250f1ec488a4f86c54bd9e1)
Change-Id: Iaf4d76c44e7bd46f78fd507cd5d6af26d691a7f1
2021-05-24 09:53:07 -07:00
Ulya Trafimovich da5c795604 Disable <uses-library> checks for more tests (to fix MTS builds).
Bug: 132357300
Bug: 188648210
Fixes: 188907662
Test: lunch aosp_cf_x86_64_phone-userdebug && m mts && m gts
Change-Id: Iae0ecac076b351b2da929bb455f00f03ece130bd
(cherry picked from commit d5e6a7c6200c0bafad3ea5d1f6c62f37420b86db)
2021-05-24 06:23:47 -07:00
Jiyong Park c6fcc77237 Updated vndk library list after aidl-freeze-api
Bug: 188713899
Test: m
Change-Id: Idf4293211069cfaa668eccb7cf382fec64353f0b
2021-05-24 08:56:47 +09:00
Michael Butler e761c25b98 Merge "Revert "Add new llndk library, libneuralnetworks_shim.so"" into sc-dev 2021-05-21 17:57:00 +00:00
Christian Wailes 7ff708ad9b Merge "Add dalvik.vm.dexopt.thermal-cutoff system property" into sc-dev 2021-05-20 22:26:34 +00:00
Hsin-Yi Chen 6968d4dc9c Add GKI to generic x86_64 board
- Remove emulator configurations from generic_x86_64/device.mk.
- Add GKI configurations to generic_x86_64/device.mk.

Test: lunch gsi_x86_64-userdebug ; make dist
Bug: 181277965
Change-Id: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
Merged-In: I43c8005afcaeec6ed70648b5f74eeed1d46f9228
(cherry picked from commit b212b0a92abf8d00e83cff1975e580033a06db33)
2021-05-20 03:22:27 +00:00
Kelvin Zhang 2067dff87c Merge "Expose ota_metadata_proto for consumption" am: 51c8f9f34c am: 9dbff33bd9 am: 580a36f814 am: ee491d95eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1708627

Bug: 186581246
Bug: 188575410

Change-Id: I996092bd29f8f6231c8055b44d59ae87d5809127
(cherry picked from commit 7780289064062d5529f88af0909fb6b02c521ac5)
2021-05-19 23:55:25 +00:00
Paul Scovanner 815c391ca3 Update Security String to 2021-07-05 am: 64b00db8f4 am: c10db361c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I3ba73fd86ee4d3f8e12d9cac06f7a080fef35e07
2021-05-19 22:51:35 +00:00
Paul Scovanner b8ae2c21e1 Update Security String to 2021-07-05 am: 64b00db8f4 am: e580c75611
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: Ie542698aef33599bf1e0d5315b58d2fcffada1d4
2021-05-19 22:42:09 +00:00
Paul Scovanner c10db361c0 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I924d2ae0887e2c5d62ed165aaa1c581495cf2905
2021-05-19 22:26:57 +00:00
Paul Scovanner e580c75611 Update Security String to 2021-07-05 am: 64b00db8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14605426

Change-Id: I89b530d9df421db3da5e3da15a38036255cda4bb
2021-05-19 22:25:31 +00:00
Chris Wailes a1c3d7aa35 Add dalvik.vm.dexopt.thermal-cutoff system property
Test: Boot
Bug: 165935246
Bug: 181795682
Change-Id: I45a8f8d6c7e99feccacd0bc8897f791571bdd9c9
2021-05-19 16:41:41 +00:00
SzuWei Lin dea57a49e2 Move GKI common settings to BoardConfigGkiCommon.mk
There are GKI arm64 and x86_64 now. The patch restructures the
GKI common settings to a new common BoardConfig file
"BoardConfigGkiCommon.mk".

It includes the ramdisk and boot image settings for GKI.
The patch also removes obsolete TARGET_PRELINK_MODULE.

Bug: 177859525
Bug: 181277965
Test: lunch gsi_arm64-userdebug ; make dist
Test: lunch gsi_x86_64-userdebug ; make dist
Change-Id: I204c8937d97140cc3c6ed3473d494f03f534ed75
Merged-In: I204c8937d97140cc3c6ed3473d494f03f534ed75
2021-05-19 09:00:16 +00:00
Michael Butler 4f436d3760 Revert "Add new llndk library, libneuralnetworks_shim.so"
This reverts commit 8685248a99.

Reason for revert: Removing libneuralnetworks_shim.so from Android S

Bug: 188587379
Test: mma
Change-Id: I3fa3092e02e9d1bbf00d801ad68ea754bfbd8c37
2021-05-18 18:05:03 -07:00
Ulyana Trafimovich 235f1507e9 Merge "Revert^6 "Enforce <uses-library> check for Android.mk modules."" into sc-dev 2021-05-18 12:57:38 +00:00