Commit Graph

70204 Commits

Author SHA1 Message Date
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
Anton Hansson 709baccebe [automerger skipped] Set PRODUCT_SHIPPING_API_LEVEL in module_* am: 9693d8bd60 -s ours
am skip reason: skip tag Change-Id I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa with SHA-1 d0871073ab is already in history

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

Change-Id: I344660ba85f810b79b6e1c982496e0c67b4a0867
2021-04-26 10:00:14 +00:00
Anton Hansson 18d83ae386 [automerger skipped] Enable CFI for media module paths in module_* am: 22fb13e8d4 -s ours
am skip reason: skip tag Change-Id I50d29c1d57849fd915dc771bb8e9f028fbe8efcd with SHA-1 f7ac2d31d4 is already in history

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

Change-Id: Ibf527a039ed07c6b3ca67fa796890368d85b78df
2021-04-26 10:00:13 +00:00
Anton Hansson 65c8e5acee [automerger skipped] Set VNDK version to current for module builds am: af35677f03 -s ours
am skip reason: skip tag Change-Id Iafb0194827f984a7ba108f519016d24b2980e2e1 with SHA-1 d7995cc8e7 is already in history

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

Change-Id: I26d56da7d1bb1b5b7aadbfdd06777a26917308f5
2021-04-26 10:00:10 +00:00
Treehugger Robot 61b2b07312 Merge "sign_target_files_apks: Relax ro.build.description requirements" am: 243f9ea65f am: 91c6bf99b2 am: 6aa3c39c95
Original change: https://android-review.googlesource.com/c/platform/build/+/1651427

Change-Id: I0c88c136c47a973cb276877ed590ae1c6417c8f6
2021-04-24 06:16:18 +00:00
Treehugger Robot 6aa3c39c95 Merge "sign_target_files_apks: Relax ro.build.description requirements" am: 243f9ea65f am: 91c6bf99b2
Original change: https://android-review.googlesource.com/c/platform/build/+/1651427

Change-Id: Idb2c97255085de4d689fc34e8cf44824cacbd2c5
2021-04-24 05:52:14 +00:00
Treehugger Robot 91c6bf99b2 Merge "sign_target_files_apks: Relax ro.build.description requirements" am: 243f9ea65f
Original change: https://android-review.googlesource.com/c/platform/build/+/1651427

Change-Id: I9db8a759a54d4c95da33087bdcd536b90e8c154e
2021-04-24 05:35:22 +00:00
Treehugger Robot 243f9ea65f Merge "sign_target_files_apks: Relax ro.build.description requirements" 2021-04-24 05:13:01 +00:00
Treehugger Robot b0cb04f766 Merge "Revert "Enable support for verity writes for VABC targets"" am: 87cfdce392 am: c06f3199fc am: 756437a802
Original change: https://android-review.googlesource.com/c/platform/build/+/1685709

Change-Id: I240c17fb6aff0a84c5ef764034fcb1206e575c5b
2021-04-24 04:51:01 +00:00
Treehugger Robot 756437a802 Merge "Revert "Enable support for verity writes for VABC targets"" am: 87cfdce392 am: c06f3199fc
Original change: https://android-review.googlesource.com/c/platform/build/+/1685709

Change-Id: Ibad0f57d1094bc50da789076f2754fb495125b2a
2021-04-24 04:27:57 +00:00
Treehugger Robot c06f3199fc Merge "Revert "Enable support for verity writes for VABC targets"" am: 87cfdce392
Original change: https://android-review.googlesource.com/c/platform/build/+/1685709

Change-Id: I3f399d5e4edf9f8846b04a497d89256c771f5e0f
2021-04-24 04:06:21 +00:00
Treehugger Robot 87cfdce392 Merge "Revert "Enable support for verity writes for VABC targets"" 2021-04-24 03:36:26 +00:00
Treehugger Robot b1ff2644bb Merge "Simplify codes for BuildSuperImage func" am: c02be15729 am: f199d2d52f am: 9488811f77
Original change: https://android-review.googlesource.com/c/platform/build/+/1685175

Change-Id: I8cec82ca445d5f54a2b3547da21a4af0cf79b4c3
2021-04-24 03:25:49 +00:00
Treehugger Robot 9488811f77 Merge "Simplify codes for BuildSuperImage func" am: c02be15729 am: f199d2d52f
Original change: https://android-review.googlesource.com/c/platform/build/+/1685175

Change-Id: I746156252174442dbaa708b1e150ce5f2f453970
2021-04-24 03:05:43 +00:00
Treehugger Robot f199d2d52f Merge "Simplify codes for BuildSuperImage func" am: c02be15729
Original change: https://android-review.googlesource.com/c/platform/build/+/1685175

Change-Id: I45b47d628bdc71838b9f31947d64bfcc98d7aa2d
2021-04-24 02:43:09 +00:00
Treehugger Robot c02be15729 Merge "Simplify codes for BuildSuperImage func" 2021-04-24 02:20:35 +00:00
Kelvin Zhang c777570825 Revert "Enable support for verity writes for VABC targets"
This reverts commit 6bb647fb85.

Reason for revert: b/186213024

Change-Id: I35054cf263c9118933fb885d5740546af3d4deec
2021-04-23 22:44:01 +00:00
Anton Hansson 9693d8bd60 Set PRODUCT_SHIPPING_API_LEVEL in module_*
This setting doesn't really make sense for unbundled builds but does
have the side-effect of turning on "full treble", which in turn is used
by some modules (libhidlbase) to conditionally use some particular -D
when compiling. The media.swcodec does not work without this define.

Bug: 185759877
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-23 15:47:21 +01:00
Anton Hansson 22fb13e8d4 Enable CFI for media module paths in module_*
This is a step on the way to make module_arm64 to produce the same
artifacts as aosp_arm64 when building unbundled modules.

Bug: 185765252
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-23 15:47:15 +01:00
Anton Hansson af35677f03 Set VNDK version to current for module builds
This setting changes which libraries are included in the media.swcodec
apex, and is a step on the way of eliminating the differences when
building between module_arm64 and aosp_arm64.

Bug: 185769808
Bug: 185789027
Test: compare media.swcodec apex build with module_arm64 and aosp_arm64
Merged-In: Iafb0194827f984a7ba108f519016d24b2980e2e1
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-23 15:47:05 +01:00
jiajia tang 92b6078314 Simplify codes for BuildSuperImage func
Use common function LoadDictionaryFromFile(), instead
of LoadDictionaryFromLines(). Makes these codes conciser.

Change-Id: Ibb6f19744246b3415bcd639bc59dbb2aede725d9
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2021-04-23 19:58:40 +08:00
Treehugger Robot c572c6dc7a Merge "Store dexpreopt.config files to dexpreopt_config.zip" am: 6edaa353b1 am: 543f6750c9 am: 0a1e0a5914
Original change: https://android-review.googlesource.com/c/platform/build/+/1666808

Change-Id: Ic836d95701bab97c0f9b579e03724b4a10a80545
2021-04-23 08:10:51 +00:00
Treehugger Robot 0a1e0a5914 Merge "Store dexpreopt.config files to dexpreopt_config.zip" am: 6edaa353b1 am: 543f6750c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1666808

Change-Id: I8ddadc92ff9d002954ab70b885c3a8052f88ca03
2021-04-23 07:46:03 +00:00
Treehugger Robot 543f6750c9 Merge "Store dexpreopt.config files to dexpreopt_config.zip" am: 6edaa353b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1666808

Change-Id: Iae3c07aa24faeede9fac97d736add433b70b17d2
2021-04-23 07:20:07 +00:00
Treehugger Robot 6edaa353b1 Merge "Store dexpreopt.config files to dexpreopt_config.zip" 2021-04-23 06:47:57 +00:00
Colin Cross f5cf5d6641 Merge "Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu" am: e9fe7ee68b am: ca44c81dfe am: 7ee635f158
Original change: https://android-review.googlesource.com/c/platform/build/+/1684108

Change-Id: I2dd378f06ef2fe3202ea00958e47cf501b2c9133
2021-04-23 01:40:16 +00:00
Colin Cross 7ee635f158 Merge "Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu" am: e9fe7ee68b am: ca44c81dfe
Original change: https://android-review.googlesource.com/c/platform/build/+/1684108

Change-Id: I77a0a200ad372080aaebcfaca1271a66808a1c9b
2021-04-23 01:17:58 +00:00
Jeongik Cha a8056d6cb9 Store dexpreopt.config files to dexpreopt_config.zip
To dexpreopt in post processing, store config files for dexpreopt

Bug: 158843648
Test: m dist and check dexpreopt_config.zip
Change-Id: I5c63a5ffc10023994b14e3a63f50defb9194739f
2021-04-23 01:01:31 +00:00
Colin Cross ca44c81dfe Merge "Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu" am: e9fe7ee68b
Original change: https://android-review.googlesource.com/c/platform/build/+/1684108

Change-Id: I5b1984fec97f02ad90596071c287500da1d569e5
2021-04-23 00:49:37 +00:00
Colin Cross e9fe7ee68b Merge "Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu" 2021-04-23 00:25:52 +00:00
Treehugger Robot 40dcd7c2a6 Merge "Enforce debugfs restrictions for S launching devices and newer" am: 9fd3b6a1f9 am: 84bcf8e6c0 am: c1d5201503
Original change: https://android-review.googlesource.com/c/platform/build/+/1668925

Change-Id: I8c28160cf91a9987956c34cd8084a3434994305d
2021-04-22 22:52:40 +00:00
Treehugger Robot c1d5201503 Merge "Enforce debugfs restrictions for S launching devices and newer" am: 9fd3b6a1f9 am: 84bcf8e6c0
Original change: https://android-review.googlesource.com/c/platform/build/+/1668925

Change-Id: I16ff878287ef5eec7b8a9ed5e9630a6726db301d
2021-04-22 22:21:34 +00:00
Treehugger Robot 84bcf8e6c0 Merge "Enforce debugfs restrictions for S launching devices and newer" am: 9fd3b6a1f9
Original change: https://android-review.googlesource.com/c/platform/build/+/1668925

Change-Id: Icbc07c385c84a689a4bab028a7bac54d93fc6481
2021-04-22 22:02:26 +00:00
Treehugger Robot 9fd3b6a1f9 Merge "Enforce debugfs restrictions for S launching devices and newer" 2021-04-22 21:43:18 +00:00
Colin Cross fa50d406bb Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu
An old TARGET_PRODUCT value pointing to a removed product or an invalid
TARGET_BUILD_VARIANT value cause lunch to fail to read
COMMON_LUNCH_CHOICES, clear them before calling into the build with
get_build_var.

Test: TARGET_PRODUCT=foobar TARGET_BUILD_VARIANT=foobar lunch
Change-Id: I53d205784149ba7e32cc093f9d81d1a82c08bfc0
2021-04-22 13:05:41 -07:00
Treehugger Robot e4ab6e85e2 Merge "Enable support for verity writes for VABC targets" am: 8d437e4168 am: 5b078870b5 am: c90167c9eb
Original change: https://android-review.googlesource.com/c/platform/build/+/1680168

Change-Id: I5c38225563afe887c205eee6b64764260145fa47
2021-04-22 19:30:29 +00:00
Tianjie Xu 71ea1fb164 Merge "More accurate error if input_file is not exists" am: f6897c8f78 am: 4e0f8bea7f am: 62c64e7a14
Original change: https://android-review.googlesource.com/c/platform/build/+/1681975

Change-Id: I40dce81b6662449c3bc26859458b06622e17b028
2021-04-22 19:29:00 +00:00
Treehugger Robot c90167c9eb Merge "Enable support for verity writes for VABC targets" am: 8d437e4168 am: 5b078870b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1680168

Change-Id: Icf7854e166e677eeb2a11fb8cbfee02ee2f8ebf3
2021-04-22 19:09:49 +00:00
Tianjie Xu 62c64e7a14 Merge "More accurate error if input_file is not exists" am: f6897c8f78 am: 4e0f8bea7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1681975

Change-Id: I34151d4390942a639c85cf71f4a0347e8cb65b30
2021-04-22 19:08:57 +00:00
Treehugger Robot 5b078870b5 Merge "Enable support for verity writes for VABC targets" am: 8d437e4168
Original change: https://android-review.googlesource.com/c/platform/build/+/1680168

Change-Id: I665f3d7eb2170b28144883a6bff29ac7ec4953e8
2021-04-22 18:54:11 +00:00
Tianjie Xu 4e0f8bea7f Merge "More accurate error if input_file is not exists" am: f6897c8f78
Original change: https://android-review.googlesource.com/c/platform/build/+/1681975

Change-Id: I75caa01d6ce67f120ba31cde45cc7b9861380780
2021-04-22 18:51:01 +00:00
Treehugger Robot 8d437e4168 Merge "Enable support for verity writes for VABC targets" 2021-04-22 18:09:11 +00:00
Tianjie Xu f6897c8f78 Merge "More accurate error if input_file is not exists" 2021-04-22 18:03:57 +00:00
Treehugger Robot ba3c7f14c7 Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" am: 207405719b am: a59a8d70de am: e2823c52fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1676422

Change-Id: I91d6183c6690b6f4fd322e26eb0c49e223637c7f
2021-04-22 17:22:51 +00:00
Treehugger Robot e2823c52fb Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" am: 207405719b am: a59a8d70de
Original change: https://android-review.googlesource.com/c/platform/build/+/1676422

Change-Id: I0554320f0ff37899ec41777f176e0bf8ba69af74
2021-04-22 17:21:00 +00:00
Treehugger Robot a59a8d70de Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" am: 207405719b
Original change: https://android-review.googlesource.com/c/platform/build/+/1676422

Change-Id: I91e852e079568b85c5c1fc1568fb1049fc2c61a6
2021-04-22 17:15:39 +00:00
Treehugger Robot 207405719b Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" 2021-04-22 17:03:31 +00:00
Anton Hansson 1da778ce91 Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610 am: ae6fb60a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I6f08948fe90e9a9400cd5e47eaa3f575b2ff9553
2021-04-22 14:00:20 +00:00
Anton Hansson ae6fb60a0b Merge "Set VNDK version to current for module builds" am: 85c91dcee9 am: 4daa3fb610
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: I4d7e7667708d17cbb9fcf4a466d1760f361a2607
2021-04-22 13:34:08 +00:00
Anton Hansson 4daa3fb610 Merge "Set VNDK version to current for module builds" am: 85c91dcee9
Original change: https://android-review.googlesource.com/c/platform/build/+/1679349

Change-Id: Ifba21bd03ef307695991ba32cc2f453d3c1fd012
2021-04-22 13:10:19 +00:00