Commit graph

68374 commits

Author SHA1 Message Date
Treehugger Robot
683c2e8696 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1 am: 9b290f9516
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61e7d471db650868ac74a4974aa0006e8fc98d71
2021-01-07 03:16:26 +00:00
Treehugger Robot
9b290f9516 Merge "Update VNDK list for product modules" am: 939e511748 am: 9120e986a1
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6384621fe54b2081c49afce2f3b8dc0e2535d2d
2021-01-07 02:25:37 +00:00
Treehugger Robot
9120e986a1 Merge "Update VNDK list for product modules" am: 939e511748
Original change: https://android-review.googlesource.com/c/platform/build/+/1519537

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I843fbd8f47da7c903859de2abfe48aa2c1946961
2021-01-07 02:08:05 +00:00
Treehugger Robot
939e511748 Merge "Update VNDK list for product modules" 2021-01-07 01:43:15 +00:00
Jose "Pepe" Galmes
f1b968b910 Merge "Support for recovery snapshot." am: bee0c588a8 am: 462db1d439 am: 80c6e0fdad
Original change: https://android-review.googlesource.com/c/platform/build/+/1533784

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I940d544ae4d22e7b8f2d2cbe85645514cd972dbc
2021-01-06 22:44:07 +00:00
Jose "Pepe" Galmes
80c6e0fdad Merge "Support for recovery snapshot." am: bee0c588a8 am: 462db1d439
Original change: https://android-review.googlesource.com/c/platform/build/+/1533784

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a47d6a18ad5ff909c68bbe07600de7aaa43bc86
2021-01-06 22:05:37 +00:00
Jose "Pepe" Galmes
462db1d439 Merge "Support for recovery snapshot." am: bee0c588a8
Original change: https://android-review.googlesource.com/c/platform/build/+/1533784

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e3bbe71de096f885518379e56af735eec552c3c
2021-01-06 21:48:49 +00:00
Jose "Pepe" Galmes
bee0c588a8 Merge "Support for recovery snapshot." 2021-01-06 21:17:54 +00:00
Bob Badour
d57578f1a6 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: 2d76d2df84 am: 3df6695ae5 am: 9f17578b3a
Original change: https://android-review.googlesource.com/c/platform/build/+/1541855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad08c83007631f8e1d26490f28fb3cf88abddf11
2021-01-06 20:22:47 +00:00
Jerome Gaillard
1b4c7f3e55 Revert "Rough-in license metadata support to make." am: 54066744f0 am: e720b8e44e am: 85b830bfcf
Original change: https://android-review.googlesource.com/c/platform/build/+/1541854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ca592d1e549e163c2679ff56cd2cf601a01c792
2021-01-06 20:22:46 +00:00
Bob Badour
9f17578b3a Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: 2d76d2df84 am: 3df6695ae5
Original change: https://android-review.googlesource.com/c/platform/build/+/1541855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ab9bc2e85df89caef505ee51e6ada0576a9ebe0
2021-01-06 20:01:14 +00:00
Jerome Gaillard
85b830bfcf Revert "Rough-in license metadata support to make." am: 54066744f0 am: e720b8e44e
Original change: https://android-review.googlesource.com/c/platform/build/+/1541854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7f0ba72108a747d3fd380b62b110d8fc7c991fb
2021-01-06 20:01:12 +00:00
Bob Badour
3df6695ae5 Merge changes from topic "revert-1377717-metalics-BOEMJWNSHV" am: 2d76d2df84
Original change: https://android-review.googlesource.com/c/platform/build/+/1541855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I281fc95f0a11bd40c50b2031a8a40923767dba2e
2021-01-06 19:54:51 +00:00
Jerome Gaillard
e720b8e44e Revert "Rough-in license metadata support to make." am: 54066744f0
Original change: https://android-review.googlesource.com/c/platform/build/+/1541854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If99d6822ea63d59684c552510a2898db237c8d88
2021-01-06 19:54:29 +00:00
Bob Badour
718f30eeb8 Merge changes from topic "metalics" am: 5e35fecc1d am: c12578c803 am: 07ee1718b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1377718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfdb4678bb16bb4cf11b6a5dbe5acd79a7766173
2021-01-06 19:54:03 +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
Bob Badour
07ee1718b4 Merge changes from topic "metalics" am: 5e35fecc1d am: c12578c803
Original change: https://android-review.googlesource.com/c/platform/build/+/1377718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0a9961d6f5d1221f936bfda293bc510bd1ae220
2021-01-06 19:12:10 +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
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
Bob Badour
c12578c803 Merge changes from topic "metalics" am: 5e35fecc1d
Original change: https://android-review.googlesource.com/c/platform/build/+/1377718

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8129313bc8667fe17881cb1666ac1f4d44a762cd
2021-01-06 18:41:57 +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
5bdd10779a [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 0fc21ee8a5 am: b073a92890 -s ours am: deeb8727ae -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1de1a70a9e44840716547063a3250313173c9103
2021-01-06 15:21:24 +00:00
Bill Yi
556a0ed6e9 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 8d34c584de am: 2e06b3ae9f -s ours am: 550bd19a45 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I530a7b8994cee1d5e0f0414ab54e1564970ce156
2021-01-06 15:21:14 +00:00
Bill Yi
deeb8727ae [automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 0fc21ee8a5 am: b073a92890 -s ours
am skip reason: Change-Id Ic0390b8c19cbe4b38042939647e316901bb4bd17 with SHA-1 3710ed0d85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I241db7a2ce88a674f2793bdd8f5db22c7575749d
2021-01-06 14:43:29 +00:00
Bill Yi
550bd19a45 [automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 8d34c584de am: 2e06b3ae9f -s ours
am skip reason: Change-Id Ic0390b8c19cbe4b38042939647e316901bb4bd17 with SHA-1 3710ed0d85 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2a59dbd09cf8f5fc71760826abcacf3c67f061b
2021-01-06 14:43:21 +00:00
Bill Yi
b073a92890 Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 0fc21ee8a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1540747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85b6f289e012d77f3873df3752a075490bf2a634
2021-01-06 14:19:47 +00:00
Bill Yi
2e06b3ae9f Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: 8d34c584de
Original change: https://android-review.googlesource.com/c/platform/build/+/1540747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f6d73b63d44e254ee58ec99734e90e2b61cc1ae
2021-01-06 14:19:21 +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
dc8be3bde3 Merge "Support building mixed versions of sepolicy" am: 5cbfbf4ca7 am: 34aed9e4aa am: d78987806a
Original change: https://android-review.googlesource.com/c/platform/build/+/1521379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa5be330c4b6b775da618a23c519349083b3a1bd
2021-01-06 06:19:20 +00:00
Inseob Kim
d78987806a Merge "Support building mixed versions of sepolicy" am: 5cbfbf4ca7 am: 34aed9e4aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1521379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id51efab9a292eab84f17dd20a00086a2a9d43f64
2021-01-06 05:36:24 +00:00
Inseob Kim
34aed9e4aa Merge "Support building mixed versions of sepolicy" am: 5cbfbf4ca7
Original change: https://android-review.googlesource.com/c/platform/build/+/1521379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1edb6528a1169e1c00666ef38f2e24d0188cb1db
2021-01-06 05:19:06 +00:00
Treehugger Robot
8ff05bbe81 Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: bc86b7b2fb am: 0716b5ddad am: 66b46de20c
Original change: https://android-review.googlesource.com/c/platform/build/+/1538760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b79347eee0a7177622dfea890768b45656294c4
2021-01-06 05:08:52 +00:00
Inseob Kim
5cbfbf4ca7 Merge "Support building mixed versions of sepolicy" 2021-01-06 05:07:05 +00:00
Treehugger Robot
66b46de20c Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: bc86b7b2fb am: 0716b5ddad
Original change: https://android-review.googlesource.com/c/platform/build/+/1538760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c01dad5a0ce7642d3f7c3e9b6d1b5e78e6ba031
2021-01-06 04:51:13 +00:00
Treehugger Robot
0716b5ddad Merge "Add TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION" am: bc86b7b2fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1538760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id74e1ecefece6339218332d207d6c7f7ee81b157
2021-01-06 04:35:34 +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
Bill Yi
fef21a5def [automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 831f195367 -s ours am: 3710ed0d85 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6476193b1983bc7ad573d83b4574a5e06186402
2021-01-05 21:58:52 +00:00
Bill Yi
3710ed0d85 [automerger skipped] Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE am: 831f195367 -s ours
am skip reason: Change-Id Iee612ad0f443d5ae9fa9e469785f304394b3d40c with SHA-1 67c6b1551d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0390b8c19cbe4b38042939647e316901bb4bd17
2021-01-05 21:40:26 +00:00
Bill Yi
831f195367 Merge RQ1A.210105.003 to stage-aosp-master - DO NOT MERGE
Merged-In: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
Change-Id: I72e6c815753207ed776cc979db21a7b6ab167a82
2021-01-05 09:15:38 -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
f3615e136b Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300 am: 67c6b1551d
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic02c3c45bba3c0ef2c2fa8d3fefd736ff0ad8f60
2020-12-30 09:54:09 +00:00
Treehugger Robot
67c6b1551d Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4 am: f4f4ba7300
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee612ad0f443d5ae9fa9e469785f304394b3d40c
2020-12-30 09:34:44 +00:00
Treehugger Robot
f4f4ba7300 Merge "Include snapuserd in recovery for VABC builds." am: 4a632325a4
Original change: https://android-review.googlesource.com/c/platform/build/+/1530572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7af0d42a42167026b6f0ab7e946bf80d3ec1073
2020-12-30 09:17:05 +00:00
Treehugger Robot
4a632325a4 Merge "Include snapuserd in recovery for VABC builds." 2020-12-30 08:27:43 +00:00
Isaac Chen
b835f3aee3 Merge "Update GF board variable for dynamic partition" am: a886df692e am: 471db4c7c5 am: d180c32852
Original change: https://android-review.googlesource.com/c/platform/build/+/1535670

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac31ecb625100b6c2240d0fbc5b15befe8e6d8f6
2020-12-30 03:32:57 +00:00