Commit Graph

67635 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
7cc0e15e4a Use python3
Test: warn.py build.log > warnings.html
Change-Id: I781ea7bfe023ec5af829757c417bc70aba80af0d
2021-04-26 17:09:36 -07:00
Treehugger Robot
5e5b52033c Merge "Copy dexpreopt.config only if it exists" 2021-04-26 16:49:16 +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
87cfdce392 Merge "Revert "Enable support for verity writes for VABC targets"" 2021-04-24 03:36:26 +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
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
Jeongik Cha
35bf6b0219 Copy dexpreopt.config only if it exists
Bug: 158843648
Test: m dist when global dexpreopt.config doesn't exist
Change-Id: Iaa8ec04624e16cecceed3f2065945a180a867b1c
2021-04-23 20:15:26 +09: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
e9fe7ee68b Merge "Clear TARGET_PRODUCT and TARGET_BUILD_VARIANT when getting lunch menu" 2021-04-23 00:25:52 +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
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
207405719b Merge "Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path" 2021-04-22 17:03:31 +00:00
Anton Hansson
85c91dcee9 Merge "Set VNDK version to current for module builds" 2021-04-22 12:51:39 +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
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
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
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
f3162034ef Merge "Test changes for build support for test jni_libs" 2021-04-20 12:26:30 +00:00
Martin Stjernholm
215596dd59 Merge "Allow selecting a different product in banchan." 2021-04-20 11:22:00 +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
66321c193b Merge "Only allow LOCAL_IS_UNIT_TEST set to ALL_MODULES if defined." 2021-04-20 01:16:45 +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
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
2c80511bd6 Merge "Re-raise exceptions instead of sys.exit" 2021-04-17 08:54:19 +00:00
Kelvin Zhang
66ed06fb29 Re-raise exceptions instead of sys.exit
If we call sys.exit(), code in finally block won't be executed.
Test: th

Change-Id: I1f743c9385218742def3b925427942cb1d5bd031
2021-04-16 19:06:00 -04:00
Liz Kammer
5b6f5a7bcc Add LOCAL_FULL_VINTF_FRAGMENTS to handle full path
Soong supports references to other modules for vintf_fragments property,
so full paths need to be passed from Soong to make rather than module
local paths.

Test: m droid
Bug: 184567830
Change-Id: Ia7f1cf977de8aeb08d41624277ff6231198222e5
2021-04-16 16:40:59 -04:00
Colin Cross
06b891d2bd Merge "Do not run "mkdir ./" in codebase root directly" 2021-04-16 20:30:27 +00:00
Jimmy Chen
507e84a266 Merge "Fix soong_config handling of CompressedApex" 2021-04-16 09:38:03 +00:00
Anton Hansson
106e11cfe7 Fix soong_config handling of CompressedApex
add_json_bool treats non-empty variable as "true" by default (which is
conventional in make). Fix treatment of PRODUCT_COMPRESSED_APEX to
support the value false.

Bug: 185537646
Test: OVERRIDE_PRODUCT_COMPRESSED_APEX=false m nothing && \
      grep CompressedApex out/soong/soong.variables
Change-Id: I0562a375be377ab67a1d064e37aff5970c4ac8dd
2021-04-16 10:09:58 +01:00
Elvis Chien
064d91c49b Allow PRODUCT_CFI_INCLUDE_PATHS to work with 32-bit builds
CFI has been enabled for 32-bit builds but this option
still only works for 64-bit builds

Bug: 179233410

Change-Id: I3a9fed728489021f6c062ad45082b0a2705cec51
2021-04-16 15:31:55 +08:00
Treehugger Robot
b2233cf162 Merge "Fix bug: repeated restricted effective conditions." 2021-04-15 21:51:20 +00:00
Treehugger Robot
c1817038f9 Merge "Re-raise exceptions instead of sys.exit" 2021-04-15 19:04:57 +00:00
Bob Badour
1f69c4404a Fix bug: repeated restricted effective conditions.
Test: m all
Change-Id: I0fc8f66dd72e3d3983b9d2b5fa7416c09a776ccc
2021-04-15 10:59:40 -07:00
Jaewoong Jung
08eb6d9308 Merge "Add a missing dependency to the prebuilt app rule." 2021-04-15 16:07:40 +00:00