Commit Graph

66284 Commits

Author SHA1 Message Date
Nikita Ioffe
c3fdfed11b Fix test_sign_apex
Test: python -m unittest test_sign_apex
Change-Id: I2a27a394b3de32fa29e487bea0b7721502a8bd98
2021-01-11 23:50:31 +00:00
Peter Collingbourne
4e98e687ec Merge "Remove ANDROID_EXPERIMENTAL_MTE." 2021-01-11 20:42:44 +00:00
Peter Collingbourne
fcd9ccf4a1 Remove ANDROID_EXPERIMENTAL_MTE.
Now that the feature guarded by this flag has landed in Linux 5.10
we no longer need the flag, so we can remove it.

Bug: 135772972
Change-Id: I02fa50848cbd0486c23c8a229bb8f1ab5dd5a56f
2021-01-11 10:55:51 -08:00
Chengyou Ho
991fe0a7d5 Merge "Add OemLock HAL to VNDK-core list" 2021-01-11 06:12:40 +00:00
ChengYou Ho
2ef12cb1c2 Add OemLock HAL to VNDK-core list
Bug: 176107318
Change-Id: I73da53a2c614c7ef68d07d84fd0e82564d56dbd2
2021-01-11 05:56:58 +00:00
Yifan Hong
cb09afc04a Merge changes from topic "common.GetBootImageTimestamp"
* changes:
  Load boot build props to info_dict properly.
  Add GetBootImageBuildProp.
  Split PARTITIONS_WITH_BUILD_PROP from *_WITH_CARE_MAP
  Move GetBootImageTimestamp to common.
2021-01-08 22:18:51 +00:00
Treehugger Robot
44412cc517 Merge "zipalign: log more I/O errors" 2021-01-08 21:12:18 +00:00
Colin Cross
383e482c22 zipalign: log more I/O errors
b/177069043 is a flake that happens in zipalign during I/O, but
the error doesn't contain enough information to determine what the
problem is.  Add more logging on I/O errors.

Test: atest --host zipalign_tests
Bug: 177069043
Change-Id: I89573e5b3867abe05d855c837bb2aa5b5c630aa7
2021-01-08 11:11:40 -08:00
Yifan Hong
10482a2a56 Load boot build props to info_dict properly.
Add boot to PARTITION_WITH_BUILD_PROP. Let PartitionBuildProps handle
boot partitions by extracting build.prop file.

Test: generate OTA and call
      `payload_info.py payload.bin`, check that boot image timestamp is
      set
Bug: 162623577

Change-Id: I71955e4ee494ffbb5d111c3d02a129c0f879b6d1
2021-01-07 17:20:22 -08:00
Yifan Hong
85ac5012aa Add GetBootImageBuildProp.
Add a function that extracts build.prop from boot image.

Test: TH
Bug: 162623577
Change-Id: I673ccd8e7c4846ca4c41a86349a388b2e800724e
2021-01-07 17:20:22 -08:00
Yifan Hong
5057b95572 Split PARTITIONS_WITH_BUILD_PROP from *_WITH_CARE_MAP
Right now they are the same content. In the future, boot will be added
to PARTITIONS_WITH_BUILD_PROP, but it is not added to
PARTITIONS_WITH_CARE_MAP. Boot partition has a cpio filesystem in the
ramdisk, so it contains a build.prop file, but it doesn't make sense to
create care map from it.

Test: TH
Bug: 162623577

Change-Id: I9b5a20fe2d774b52cf7d5eae9deecbc75122a3dd
2021-01-07 17:20:22 -08:00
Yifan Hong
c65a0545dd Move GetBootImageTimestamp to common.
Test: TH
Bug: 162623577

Change-Id: Icbd8b07dce91006a1abca1f0dc40726de8a10219
2021-01-07 17:20:22 -08:00
Treehugger Robot
17652e8981 Merge "Implement fake vendor snapshot" 2021-01-08 00:24:51 +00:00
Treehugger Robot
c19b3445ad Merge "Move keymint to security." 2021-01-07 23:32:09 +00:00
Bob Badour
ddfcfb8e2b Merge changes from topic "revert-1541855-revert-1377717-metalics-BOEMJWNSHV-PBOZXBJQZD"
* changes:
  Revert^2 "Rough-in license metadata support to make."
  Revert^2 "Add variables for notice deps, license kinds etc."
2021-01-07 22:42:08 +00:00
Yifan Hong
1ed887f2c3 Merge "Add 5.10-android12-0 KMI for generic_arm64" 2021-01-07 21:23:10 +00:00
Janis Danisevskis
08764606de Move keymint to security.
Keymint has moved to hardware/interfaces/security, and all HALs under
security should be cfi enabled.

Test: N/A
Change-Id: Ie40f6a04acdb9091bdf5318b889407af89c787e1
2021-01-07 12:06:50 -08:00
Inseob Kim
c497641e6f Implement fake vendor snapshot
A fake vendor snapshot is a vendor snapshot whose prebuilt binaries and
captured headers are all empty. It's much faster to be built than the
real vendor snapshot, so users can exploit the fake vendor snapshot to
reduce the size of vendor snapshot they need, by installing the fake
snapshot and then inspecting the ninja dependencies.

Bug: 157967325
Test: m dist vendor-fake-snapshot
Change-Id: I7fa5d5033a296965b21e840765cc7fe02fd1f44e
2021-01-07 13:56:33 +09:00
Bob Badour
7a95820907 Revert^2 "Rough-in license metadata support to make."
Changed shell script to /bin/sh syntax for portability to mac_os etc.

54066744f0

Change-Id: Ibd472fc1bedfdc228a704108f0280b13ab1c9333
2021-01-06 20:52:43 -08:00
Bob Badour
21bd34fe09 Revert^2 "Add variables for notice deps, license kinds etc."
dcfb9c5ef5

Change-Id: I6a60f55ab0e7013061a695cb1b7c5ffde29577dd
2021-01-06 20:46:49 -08:00
Treehugger Robot
939e511748 Merge "Update VNDK list for product modules" 2021-01-07 01:43:15 +00:00
Jose "Pepe" Galmes
bee0c588a8 Merge "Support for recovery snapshot." 2021-01-06 21:17:54 +00:00
Bob Badour
2d76d2df84 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV"
* changes:
  Revert "Add variables for notice deps, license kinds etc."
  Revert "Rough-in license metadata support to make."
2021-01-06 19:17:43 +00:00
Jerome Gaillard
dcfb9c5ef5 Revert "Add variables for notice deps, license kinds etc."
Revert "Export soong license data to make."

Revert "Add ability to declare licenses in soong."

Revert submission 1377717-metalics

Reason for revert: This has broken renderscript_mac target for aosp-master, see b/176909442

Reverted Changes:
I26ac54ca9:Define the standard license_kind rules.
I656486070:Export soong license data to make.
If9d661dfc:Export soong license data to make.
I97943de53:Add ability to declare licenses in soong.
Icaff40171:Rough-in license metadata support to make.
Ib8e538bd0:Add variables for notice deps, license kinds etc.

Change-Id: I1f672e6e8ec48f0141bb4b6cc4eb2efed1eeef6b
2021-01-06 19:00:05 +00:00
Jerome Gaillard
54066744f0 Revert "Rough-in license metadata support to make."
Revert "Export soong license data to make."

Revert "Add ability to declare licenses in soong."

Revert submission 1377717-metalics

Reason for revert: This has broken renderscript_mac target for aosp-master, see b/176909442

Reverted Changes:
I26ac54ca9:Define the standard license_kind rules.
I656486070:Export soong license data to make.
If9d661dfc:Export soong license data to make.
I97943de53:Add ability to declare licenses in soong.
Icaff40171:Rough-in license metadata support to make.
Ib8e538bd0:Add variables for notice deps, license kinds etc.

Change-Id: Iaf2243cba16f6191b022371a14f81ef8194a47d1
2021-01-06 19:00:05 +00:00
Bob Badour
5e35fecc1d Merge changes from topic "metalics"
* changes:
  Rough-in license metadata support to make.
  Add variables for notice deps, license kinds etc.
2021-01-06 18:08:06 +00:00
Bill Yi
0fc21ee8a5 Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" 2021-01-06 13:58:59 +00:00
Inseob Kim
5cbfbf4ca7 Merge "Support building mixed versions of sepolicy" 2021-01-06 05:07:05 +00:00
Bill Yi
8d34c584de Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE
Merged-In: Ic0390b8c19cbe4b38042939647e316901bb4bd17
Change-Id: I4f5adfb48b892311c1bd2dd2a50b670547eb2fb5
2021-01-05 18:30:21 -08:00
Inseob Kim
fb7c801b67 Support building mixed versions of sepolicy
Now newer system policy and older vendor policy can be built together by
setting following variables:

- BOARD_SEPOLICY_VERS
- BOARD_REQD_MASK_POLICY (copy of older system/sepolicy/reqd_mask)
- BOARD_PLAT_VENDOR_POLICY (copy of older system/sepolicy/vendor)
- BOARD_(SYSTEM_EXT|PRODUCT)_(PUBLIC|PRIVATE)_PREBUILT_DIRS (copy of
  older system_ext and product policies)

Bug: 168159977
Test: try normal build and mixed build
Test: boot and check selinux denials
Change-Id: I4e2890c96cab69e60c83c60f8c396cfe049ec05b
2021-01-06 10:41:45 +09:00
Treehugger Robot
bc86b7b2fb Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" 2021-01-06 00:09:54 +00:00
Yifan Hong
f57771a299 Add 5.10-android12-0 KMI for generic_arm64
... to build 5.10 GKI APEXes.

Test: TH
Bug: 160995535
Change-Id: I822ac73e8fc23cb957f748d4e6becdc3f7ac9567
2021-01-05 11:51:32 -08:00
Bob Badour
20fc1b3719 Rough-in license metadata support to make.
Change-Id: Icaff40171b94538219a8caa697b182dbdcc8229a
2021-01-05 08:42:48 -08:00
Bob Badour
6421674a39 Add variables for notice deps, license kinds etc.
Change-Id: Ib8e538bd09044a5791083b362d807cd9293833d5
2021-01-05 08:42:48 -08:00
Jiyong Park
cddea9b426 Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION
The APEX symlink optimization is a build-time trick to save the
storage/RAM usage of APEX by replacing some files in APEX with symlinks
to the files in the system partition. The optimization however is
automatically turned off for 'updatable: true' APEXes because doing the
optimization for them will hide the sys-health implication until when
the APEXes are built unbundled (i.e. prebuilt) and thus the
optimization is impossible.

TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION forcibly disables the safety net.
When it is set to true, the symlink optimization is done regardless of
the 'updatable' property. This is useful for some of the devices like Go
where most APEXes (even the 'updatable: true' ones) should be
effectively non-updatable.

Bug: 175630508
Test: TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION=true m and check that
updatable APEXes have symlinks to system libs

Change-Id: I261fd4ab2dd8e62ff435306b11168121cbcf662a
2021-01-05 21:03:30 +09:00
Justin Yun
54146eeed8 Update VNDK list for product modules
Add the list for product_available VNDK list.
This will be frozen by the release process.

Bug: 174323911
Test: build
Change-Id: Ic5f045d9210b09eef6d6c15230e8177d8c98bd22
2021-01-05 13:14:11 +09:00
Treehugger Robot
4a632325a4 Merge "Include snapuserd in recovery for VABC builds." 2020-12-30 08:27:43 +00:00
Isaac Chen
a886df692e Merge "Update GF board variable for dynamic partition" 2020-12-30 02:29:28 +00:00
Isaac Chen
c311ff6b68 Update GF board variable for dynamic partition
Goldfish specific board variable:

BOARD_EMULATOR_DYNAMIC_PARTITIONS_SIZE

is used to create misc_info.txt, which is needed to mix GSI or CSI on
Goldfish vendor image, and need to reflect the size of the current
super.img, which is now set to 4G+8M (from 3G+8M previously).

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
      super_emulator_dynamic_partitions_group_size=4294967296
Change-Id: Idd0fb302b20780ac97959fabec231a632205d46d
2020-12-25 06:14:43 +00:00
Kalesh Singh
7af0218468 Merge "Reply: Add stable aidl memtrack hal to vndk list" 2020-12-23 01:20:51 +00:00
Treehugger Robot
fdb2f2c5db Merge "Swich TEST_MAPPING config to unit_tests:true" 2020-12-22 21:32:31 +00:00
Kalesh Singh
0386daa353 Reply: Add stable aidl memtrack hal to vndk list
Bug: 175021432
Test: m; boot;
Change-Id: I68906dde64d70c5be63ddea050b20f320a3e78aa
2020-12-22 20:50:06 +00:00
Isaac Chen
3aa08cfa94 Merge "Increase the size of super.img for Goldfish" 2020-12-22 16:56:49 +00:00
Anton Hansson
6d10bf974a Merge "Add mainline_sdk device and product" 2020-12-22 11:40:32 +00:00
Isaac Chen
91a641324c Increase the size of super.img for Goldfish
Current super image for GF is almost full in sdk_gphone_x86_arm
product, and not big enough to include CSI for mixed configuration,
which is a bit bigger than the system image of sdk_gphone_x86_arm.

Bug: 174442566
Test: $ lunch aosp_x86_arm-userdebug; m
      $ ls -l $OUT/super.img	# make sure it's 4 GB
Change-Id: Ia2473231c8490995a10700cbd6e0f82598a5e078
2020-12-22 03:43:26 +00:00
Julien Desprez
dc0663f66f Merge "Remove the zipalign_test mapping file" 2020-12-22 00:25:05 +00:00
David Anderson
da770507ab Include snapuserd in recovery for VABC builds.
Bug: N/A
Test: snapuserd available in recovery
Change-Id: Ide10a1da72becffad53f1daf2594d57813fc6636
2020-12-21 23:35:45 +00:00
Julien Desprez
6d9e78fd5d Swich TEST_MAPPING config to unit_tests:true
All unit_tests:true are run in presubmit which avoids
the explicit definition of TEST_MAPPING.

Test: presubmit runs all those tests
Bug: 175408655
Change-Id: Ibfad3fe2dd8d2fa1ebc6f6bcbd8ab34c2a0069dc
2020-12-21 13:56:05 -08:00
Julien Desprez
2bbc159e97 Remove the zipalign_test mapping file
Not needed as the host-unit-tests suite runs in
presbumit now and cover this

Test: None
Bug: 175408655
Change-Id: Iea3e3cd7f696f43b6c686ef9cbee1194f514e589
2020-12-21 09:58:17 -08:00
Jose Galmes
5cd2547df9 Support for recovery snapshot.
Bug: 171231437
Test: source build/envsetup.sh
Test: ALLOW_MISSING_DEPENDENCIES=true m -j nothing
Change-Id: I6dbcf21ee26c53cd3ac573d118a99d68161aa2c7
2020-12-21 08:32:44 -08:00