StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Introduce BUILD_BROKEN_INPUT_DIR_MODULES" am: 16e2fc2da1 am: 0ac682fc9a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1966254

Change-Id: I62a726a4d418efb6dc82b95cb5f5accf3af0bebb
This commit is contained in:
Liz Kammer
2022-03-01 16:13:27 +00:00
committed by Automerger Merge Worker
parent 4e8705b181 0ac682fc9a
commit 52f1ce8473
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Changes.md
View File

@@ -1,5 +1,35 @@
# Build System Changes for Android.mk Writers
## Genrule starts disallowing directory inputs
To better specify the inputs to the build, we are restricting use of directories
as inputs to genrules.
To fix existing uses, change inputs to specify the inputs and update the command
accordingly. For example:
```
genrule: {
name: "foo",
srcs: ["bar"],
cmd: "cp $(location bar)/*.xml $(gendir)",
...
}
```
would become
```
genrule: {
name: "foo",
srcs: ["bar/*.xml"],
cmd: "cp $(in) $(gendir)",
...
}
`BUILD_BROKEN_INPUT_DIR_MODULES` can be used to allowlist specific directories
with genrules that have input directories.
## Dexpreopt starts enforcing `<uses-library>` checks (for Java modules)
In order to construct correct class loader context for dexpreopt, build system

1
core/board_config.mk
View File

@@ -174,6 +174,7 @@ _build_broken_var_list := \
BUILD_BROKEN_DUP_SYSPROP \
BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES \
BUILD_BROKEN_ENFORCE_SYSPROP_OWNER \
BUILD_BROKEN_INPUT_DIR_MODULES \
BUILD_BROKEN_MISSING_REQUIRED_MODULES \
BUILD_BROKEN_OUTSIDE_INCLUDE_DIRS \
BUILD_BROKEN_PREBUILT_ELF_FILES \

1
core/soong_config.mk
View File

@@ -270,6 +270,7 @@ $(call add_json_str, ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL))
$(call add_json_bool, BuildBrokenEnforceSyspropOwner, $(filter true,$(BUILD_BROKEN_ENFORCE_SYSPROP_OWNER)))
$(call add_json_bool, BuildBrokenTrebleSyspropNeverallow, $(filter true,$(BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW)))
$(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(filter true,$(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)))
$(call add_json_list, BuildBrokenInputDirModules, $(BUILD_BROKEN_INPUT_DIR_MODULES))
$(call add_json_bool, BuildDebugfsRestrictionsEnabled, $(filter true,$(PRODUCT_SET_DEBUGFS_RESTRICTIONS)))