Commit Graph

67777 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Anton Hansson
85c91dcee9 Merge "Set VNDK version to current for module builds" 2021-04-22 12:51:39 +00:00
Colin Cross
8875d060db Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" am: 37b11b8cfb
Original change: https://android-review.googlesource.com/c/platform/build/+/1680749

Change-Id: I9ce079644c063667a2a834ead33926799171379c
2021-04-22 00:08:42 +00:00
Colin Cross
37b11b8cfb Merge "Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS" 2021-04-21 23:15:40 +00:00
Kelvin Zhang
6bb647fb85 Enable support for verity writes for VABC targets
We already added support on device to write verity. Flipping a flag in
ota generation tools to enable verity.

Test: th && running OTA repeatedly on bramble
Change-Id: Id1639f644eb8c23f97e171264702a7872f41411a
2021-04-21 15:19:23 -04:00
Anton Hansson
8b5677a3f0 Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" am: e6c0eee673
Original change: https://android-review.googlesource.com/c/platform/build/+/1679348

Change-Id: Iaf3d9875efe272ef523fe9f38776121239eb8326
2021-04-21 14:57:02 +00:00
Anton Hansson
e6c0eee673 Merge "Set PRODUCT_SHIPPING_API_LEVEL in module_*" 2021-04-21 14:32:15 +00:00
Anton Hansson
d0871073ab 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
Change-Id: I1ebeb5f37816d8576a00ab7553cb4e9e1cab8cfa
2021-04-21 14:31:47 +00:00
Anton Hansson
9e3c0982e7 Merge "Enable CFI for media module paths in module_*" am: e50287e1b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1679347

Change-Id: I191fb0f6f3d61b28ff9937cd439753614fe01460
2021-04-21 13:53:25 +00:00
Anton Hansson
e50287e1b5 Merge "Enable CFI for media module paths in module_*" 2021-04-21 13:29:59 +00:00
Anton Hansson
f7ac2d31d4 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
Change-Id: I50d29c1d57849fd915dc771bb8e9f028fbe8efcd
2021-04-21 10:19:28 +01:00
Anton Hansson
d7995cc8e7 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
Change-Id: Iafb0194827f984a7ba108f519016d24b2980e2e1
2021-04-21 09:58:51 +01:00
jiajia tang
92be6ee9d7 More accurate error if input_file is not exists
This patch is intended to make build log is more
accurate if input_file is not exists, then check if
it is a zipfile.

Change-Id: I30da0141ea44fc3ce0947f868a86a15a054a4346
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
2021-04-21 16:41:58 +08:00
Treehugger Robot
f44effaaa5 Merge "Performs basic APEX validation in the merged target files package." am: 50a00289ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1676424

Change-Id: I6b7323787148b183e32387c129bf9d63eed78ca9
2021-04-20 23:53:06 +00:00
Treehugger Robot
50a00289ea Merge "Performs basic APEX validation in the merged target files package." 2021-04-20 23:32:31 +00:00
Colin Cross
e85c66ccea Remove module-lib and system-server from TARGET_AVAILABLE_SDK_VERSIONS
module-lib and system-server are not supported in Make, remove them
from TARGET_AVAILABLE_SDK_VERSIONS.

Also replace the hardcoded test_current version with the one found in
the prebuilts.

Fixes: 185903998
Test: get_build_var TARGET_AVAILABLE_SDK_VERSIONS
Change-Id: I745fbcf019092ec27a9903c48fdb95e892c02e3e
2021-04-20 10:18:37 -07:00
Treehugger Robot
bcc08a2454 Merge "Test changes for build support for test jni_libs" am: f3162034ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1680149

Change-Id: If8fdc985ad1fe4a1c0a0f1fe3b593c6b18f34676
2021-04-20 12:58:09 +00:00
Treehugger Robot
f3162034ef Merge "Test changes for build support for test jni_libs" 2021-04-20 12:26:30 +00:00
Martin Stjernholm
818ba93565 Merge "Allow selecting a different product in banchan." am: 215596dd59
Original change: https://android-review.googlesource.com/c/platform/build/+/1675830

Change-Id: I1e7c7b6449e3b367394b3c6c09997251c3a1bf24
2021-04-20 11:36:24 +00:00
Martin Stjernholm
215596dd59 Merge "Allow selecting a different product in banchan." 2021-04-20 11:22:00 +00:00
Treehugger Robot
a74fbc00a0 Merge "Rename ro.product.enforce_debugfs_restrictions" am: 228ef5f05f
Original change: https://android-review.googlesource.com/c/platform/build/+/1676369

Change-Id: Ia56f89b173d19c7797f8b3b94a24da76e5eaff0f
2021-04-20 06:32:21 +00:00
Treehugger Robot
228ef5f05f Merge "Rename ro.product.enforce_debugfs_restrictions" 2021-04-20 06:07:53 +00:00
Daniel Cardenas
68984aa93a Test changes for build support for test jni_libs
Tested with patches:  aosp/1560314  aosp/1560314/

Bug: 176593487
Test: make tvts aapt
Change-Id: I2a2867726cc39758dfb27a0a12867e20e4af56d7
2021-04-19 20:48:02 -07:00
Treehugger Robot
759af2af07 Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." am: 66321c193b
Original change: https://android-review.googlesource.com/c/platform/build/+/1679525

Change-Id: Ie3d20ba6ed9ce95933c3c10257f38e2c4f03572d
2021-04-20 02:52:53 +00:00
Treehugger Robot
66321c193b Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." 2021-04-20 01:16:45 +00:00
Treehugger Robot
cb760624f0 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" am: b4863637a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1675585

Change-Id: I699ebfa811402ded0e5e7db350983696f70856fa
2021-04-19 23:17:34 +00:00
Treehugger Robot
b4863637a2 Merge "Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds" 2021-04-19 23:00:57 +00:00
Daniel Norman
e9af70ad68 Performs basic APEX validation in the merged target files package.
Uses apex_utils.GetApexInfoFromTargetFiles to find and parse APEX files
in the target files partition dirs. Raises an error on failure to parse
or duplicate package names.

Bug: 177225446
Test: releasetools_test
Test: Create a merged build that provides the VNDK APEX on both vendor
      and system. Observe failure.
Change-Id: I1356e263b7b32d6063129e079f3ba7ab4ff132a7
2021-04-19 22:31:01 +00:00
Treehugger Robot
c4927f6789 Merge "envsetup: fix indent" am: 9dbecd650f
Original change: https://android-review.googlesource.com/c/platform/build/+/1679546

Change-Id: If019e06cf6b1462a10dbde541a22b6c3f937ee5e
2021-04-19 19:24:03 +00:00
Treehugger Robot
9dbecd650f Merge "envsetup: fix indent" 2021-04-19 18:16:08 +00:00
Hridya Valsaraju
31b2e3e388 Rename ro.product.enforce_debugfs_restrictions
Rename ro.product.enforce_debugfs_restrictions appropriately to
ro.product.debugfs_restrictions.enabled as per the sysprop naming
scheme.

Test: build, boot
Bug: 184381659
Change-Id: I65265098caf6382583aa53811f1b3330e58141c0
2021-04-19 17:41:25 +00:00
Martin Stjernholm
2b8d923a09 Allow selecting a different product in banchan.
Necessary since the products used for APEX modules are different in
internal builds.

Test: banchan com.android.art
Test: banchan com.android.art arm
Test: banchan com.android.art art_module_arm
Test: banchan com.android.art module_arm
Test: banchan com.android.art x86_64
Test: banchan com.android.art art_module_x86_64
Bug: 179779520
Change-Id: Ib59a86b70e409537aaad7258465b6874b589b858
2021-04-19 18:32:00 +01:00
Timi
0469c3f91c envsetup: fix indent
Test: . build/envsetup.sh
Change-Id: I829dafc707dc02d5a31899a784f88a367ec95e94
Signed-off-by: Timi <timi.rautamaki@gmail.com>
2021-04-19 17:07:53 +02:00
yangbill
877586c8c8 Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined.
To prevent the argument be cleaned if the same module name with
different unit_test value, treat it as unit test if one of the module is
treated as unit tests.

Bug: 176096135
Test: m out/target/product/generic/module-info.json
Change-Id: Iee4ee1063d47dcba1aaf915ec9e4e56f8c7df787
2021-04-19 20:34:07 +08:00
Treehugger Robot
9c111c7dc5 Merge "Re-raise exceptions instead of sys.exit" am: 2c80511bd6
Original change: https://android-review.googlesource.com/c/platform/build/+/1677725

Change-Id: Iaa6a7872ff44a53fc34dd12b6b8e57ff55f47381
2021-04-17 09:24:29 +00:00
Treehugger Robot
2c80511bd6 Merge "Re-raise exceptions instead of sys.exit" 2021-04-17 08:54:19 +00:00