summaryrefslogtreecommitdiff
path: root/common
AgeCommit message (Collapse)Author
2021-11-11[automerger] Fix BOARD_SYSTEMSDK_VERSIONS checks am: 8bc9635304Justin Yun
Change-Id: Ieebf4ba2fe6b1377adc43cc483305a3554140f87
2021-11-11Fix BOARD_SYSTEMSDK_VERSIONS checksJustin Yun
BOARD_SYSTEMSDK_VERSIONS must be greater than or equal to the minimum of PRODUCT_SHIPPING_API_LEVEL and BOARD_API_LEVEL. If BOARD_API_LEVEL is not defined, read BOARD_SHIPPING_API_LEVEL. If both board api levels are not defined, compare only with PRODUCT_SHIPPING_API_LEVEL. Bug: 204964200 Bug: 201489975 Bug: 202919753 Test: manual test with different settings Change-Id: I36fa0b2fed3bca9ebe1baad46ee1dbe8cb1414e3 (cherry picked from commit e81ec6960a64077cb46983499e80bdcc2dc316e2)
2021-02-11Preserve <uses-library> order in dexpreopt.config files.Ulya Trafimovich
Library order is important because it is used to construct class loader context, which is then written into OAT/ODEX files and chacked against class loader context constructed by PackageManager on the device. If the orders are different, dexpreopted code is rejected. This CL fixes a few problems that caused reordering: - 'filter' function arguments are swapped so that patterns list comes first, and the library list second - JSON representation of class loader context is changed to avoid unmarshaling it to Go maps, which may reorder keys - library list is no longer sorted (it's unclear why it was sorted) Bug: 132357300 Test: lunch cf_x86_64_phone-userdebug && m && launch_cvd \ adb wait-for-device && adb root && adb logcat \ | grep -E 'ClassLoaderContext [a-z ]+ mismatch' # empty grep output, no errors Change-Id: Ie76996d497e60da0948f1879d6db589ff3e968a2
2020-10-29Add a rule to get numbers greater or equal to a minimum number.yawanng
Cherry-pick from b235859ac07620df58988b4fade9f4edd59ea4eb Bug: 171217392 Test: Make Change-Id: I04df72f813f892f0b6dec8b48e2a113af4545148 Merged-In: I04df72f813f892f0b6dec8b48e2a113af4545148
2020-07-30Change use of sanity-check to "test". Makes comment line more clear what ↵Daniel Cardenas
the code does. Update language to comply with Android's inclusive language guidance See https://source.android.com/setup/contribute/respectful-code for reference BUG=162536543 Change-Id: Ie9694d987e57670874e4708c55ad40da518d672b
2020-04-16strings.mk: Allow empty RHS values for inputs of collapse-pairsYoukichi Hosoi
This CL is to make the function collapse-pairs(), which is applied to lists of "property=value" pairs, allow empty properties (i.e. lines of the form "empty.prop="). Currently, the function only allows empty properties at the end (see https://android-review.googlesource.com/c/platform/build/+/722908). So empty properties in the middle result in broken property files (e.g. "a=b c= d=e" is transformed to "a=b c=d=e", in which the property "c", which originally has no value, is interpreted as having the value "d=e", whereas the property "d", which originally has the value "e", is missing from the resulting property file). This CL revises the function so as to keep empty properties in the middle as is (e.g. it returns "a=b c= d=e" for the above example), while preserving the behavior for well-formed lists like "a=b c= d e = f". Bug: 152379493 Test: make Change-Id: I35faeaedc3bc42e56e01201baf7ea6805a610439 Merged-In: I35faeaedc3bc42e56e01201baf7ea6805a610439 (cherry picked from commit f6652f4f186d11df7b09965e16fc850516962d8e)
2020-04-02strings.mk: Allow empty RHS values for inputs of collapse-pairsYoukichi Hosoi
This CL is to make the function collapse-pairs(), which is applied to lists of "property=value" pairs, allow empty properties (i.e. lines of the form "empty.prop="). Currently, the function only allows empty properties at the end (see https://android-review.googlesource.com/c/platform/build/+/722908). So empty properties in the middle result in broken property files (e.g. "a=b c= d=e" is transformed to "a=b c=d=e", in which the property "c", which originally has no value, is interpreted as having the value "d=e", whereas the property "d", which originally has the value "e", is missing from the resulting property file). This CL revises the function so as to keep empty properties in the middle as is (e.g. it returns "a=b c= d=e" for the above example), while preserving the behavior for well-formed lists like "a=b c= d e = f". Bug: 152379493 Test: make Change-Id: I35faeaedc3bc42e56e01201baf7ea6805a610439
2020-01-11Define PRODUCT_PRODUCT_VNDK_VERSION automaticallyJustin Yun
PRODUCT_PRODUCT_VNDK_VERSION will be automatically set to true for the devices with PRODUCT_SHIPPING_API_LEVEL newer than 29. Bug: 146621746 Test: build with PRODUCT_SHIPPING_API_LEVEL set to 30 Change-Id: I78cd81d1d61e9089b163169bc495df8a880463da
2019-08-08Move TOP/TOPDIR to build/make/common/core.mkDan Willemsen
So that they're set properly during dumpvars / product loading. SHELL is already set in common/core.mk, so it's not necessary to be in core/main.mk as well (which quickly loads core/config.mk, which loads common/core.mk). Test: get_build_var TOP Test: get_build_var TOPDIR Change-Id: I8179ac32628b74ccf29851dc53bf83cfb4b280fd
2018-12-17Move dexpreopting to SoongColin Cross
Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. This relands I59b20c931ee3e5a8d35eb30da4148691c5095502, I39d580999947ee54cfefe875b57a028be5333bd7, Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and Ica006a007d112c232311435aaac0c0e476232b67, with a minor update to match the changes made to dexpreopt_gen arguments and a fix to correctly keep dexpreopt disabled on mac builds. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-12-14Revert "Move dexpreopting to Soong"Colin Cross
This reverts commit e736c58043290dad18ddbd690d554cdc413157a8. Test: none Bug: 119412419
2018-12-12Move dexpreopting to SoongColin Cross
Move the dexpreopting logic into Soong. Make modules will be dexpreopted by executing the Soong logic in the standalone dexpreopt_gen binary, which will generate scripts that will perform dexpreopting for each module. Export global configuration as JSON to $OUT/dexpreopt.config, which will be used by dexpreopt_gen and Soong, and per-module JSON configuration that will be used by dexpreopt_gen. Bug: 119412419 Bug: 120273280 Test: no differences to dexpreopt outputs on aosp_sailfish system/, only expected changes to dexpreopt outputs on system_other (.vdex files for privileged Soong modules no longer incorrectly contain .dex contents). Change-Id: I59b20c931ee3e5a8d35eb30da4148691c5095502
2018-10-20Refactor common makefile fragmentsDan Willemsen
In preparation for setting up another Kati stage, move some common settings and tools into a common folder. This way it's a bit easier to see that they're safe to use, and that they shouldn't depend on anything outside of the common folder. Bug: 117463001 Test: build-aosp_arm.ninja is the same before and after Change-Id: Ief4b75a4dbe45b73ffd03bf32c60695c816d979d
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 08:52:18 +0000