Commit Graph

28743 Commits

Author SHA1 Message Date
Cole Faust
242445d62c Merge "Don't assume _soong_config_namespaces_key is present" am: 8a7e9afc54 am: 35d5a4331c
Original change: https://android-review.googlesource.com/c/platform/build/+/1892960

Change-Id: I5b958d35c901fb18f77842b880f4c0825efca13a
2021-11-16 20:33:31 +00:00
Cole Faust
8a7e9afc54 Merge "Don't assume _soong_config_namespaces_key is present" 2021-11-16 19:45:20 +00:00
Colin Cross
4b89b964c7 Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" am: d1c2c4e1b8 am: 23eafdab4c
Original change: https://android-review.googlesource.com/c/platform/build/+/1892959

Change-Id: I9dd29cd7f9403d178d3334fd583465fb39008c9b
2021-11-16 00:38:04 +00:00
Cole Faust
2f4692bf31 Don't assume _soong_config_namespaces_key is present
The board configuration doesn't use init_globals(),
which is where _soong_config_namespaces_key normally
is set. Just assume empty dictionaries in
soong_config_namespace where appropriate.

Bug: 201700692
Test: build/bazel/ci/rbc_product_config.sh -b armv8-userdebug
Change-Id: I5f1e52fa0bdde32bff0e8db54861557dcb327190
2021-11-15 16:03:51 -08:00
Colin Cross
d1c2c4e1b8 Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" 2021-11-15 23:57:57 +00:00
Xin Li
b461e822a1 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235
Change-Id: I5e0d686c2a1cc15e6a3115243f3a83cb070b111c
2021-11-15 23:30:54 +00:00
Treehugger Robot
35c2a2d115 Merge "Always default to 1.9 for host java modules in Android.mk files" am: f1e1bcb0ee am: 4acd14b291
Original change: https://android-review.googlesource.com/c/platform/build/+/1892956

Change-Id: Ic304f42d225e1cc357f6276c0be3dffe9341cc5c
2021-11-15 22:56:26 +00:00
Ivan Lozano
ca8f517b40 Merge "Merge soong_{cc,rust}_prebuilt.mk" am: d59e23e2eb am: 77e40908fa
Original change: https://android-review.googlesource.com/c/platform/build/+/1891055

Change-Id: Iada1e733022a768dd3e0e1f11b58dc1c42484e03
2021-11-15 22:56:11 +00:00
Treehugger Robot
f1e1bcb0ee Merge "Always default to 1.9 for host java modules in Android.mk files" 2021-11-15 22:36:51 +00:00
Colin Cross
362f55af96 Always default to 1.9 for host java modules in Android.mk files
Host modules shouldn't use the logic for device modules to determine
the java language version to use, always default to 1.9.

Bug: 202761304
Test: m checkbuild
Change-Id: I268dd34d887db4646e188858c7f2aedc30966856
2021-11-15 21:46:52 +00:00
Colin Cross
802f2116ed Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE
Soong creates install rules and lists them in LOCAL_SOONG_INSTALL_PAIRS,
where they get copied to ALL_MODULE.$(m).BUILT_INSTALLED.  BUILT_INSTALLED
is used by package-modules.mk to copy the built modules to alternate
install locations for building zips like continuous_native_tests.zip.

Translate Soong's built module location, which is listed in
LOCAL_PREBUILT_MODULE_FILE, into $(LOCAL_BUILT_MODULE) when setting
BUILT_INSTALLED so that package-modules.mk copies from
$(LOCAL_BUILT_MODULE) instead of $(LOCAL_PREBUILT_MODULE_FILE).  This
ensures that the transitive dependencies added to $(LOCAL_BUILT_MODULE),
for example the unstripped symbols files, are present when
continuous_native_tests.zip is built.

Bug: 206137439
Test: manual
Change-Id: I1a45cd6d3c81d6435a10f4d29557e521753068a4
2021-11-15 13:15:22 -08:00
Inseob Kim
c1d4512e02 Add missing apksigner dependency
Test: build after removing apksigner
Change-Id: I1ed7f13395bf7d5fe5f06a6bc3280809b5038636
2021-11-15 11:26:57 +09:00
Yifan Hong
276b8c0230 Add recovery service_contexts.
This allows servicemanager to run in recovery.

Test: manual
Bug: 170338625
Change-Id: I60671af0bcaf13fd545b2f286243fee474caace5
2021-11-13 00:28:05 -08:00
Ivan Lozano
d96be59972 Merge soong_{cc,rust}_prebuilt.mk
Much of soong_cc_prebuilt.mk is duplicated in soong_rust_prebuilt.mk.
This adds maintenance burden and increases the risk of bugs or
inconsistencies. Merge the two to simplify this.

Bug: N/A, clean-up
Test: m
Change-Id: I833fba94e299006b34f8e53d5519c6b19f684d39
2021-11-12 13:20:08 -05:00
Treehugger Robot
173e8a3f90 Merge changes from topic "fsverity_digest" am: 866d824328 am: f90fb54430
Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: I90c59cf7900eda8f903852c6de77868960cdaa01
2021-11-12 07:02:16 +00:00
Inseob Kim
f69346e0a8 Add fsverity digest manifest
fsverity digest manifest stores a map from files to fsverity digests.
The manifest is installed as a serialized protobuf file, to a signed apk
system/etc/security/fsverity/BuildManifest.apk.

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: I55fc10400206b8ce0d5f198faea08fe3930b362c
2021-11-11 11:19:44 +00:00
Inseob Kim
9cda397948 Implement fsverity metadata generator
Using fsverity tool, fsverity metadata for specific artifacts in system
mage can be generated. Users can do that by setting a makefile variable
PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA to true.

If set to true, the following artifacts will be signed.

- system/framework/*.jar
- system/framework/oat/<arch>/*.{oat,vdex,art}
- system/etc/boot-image.prof
- system/etc/dirty-image-objects

One fsverity metadata container file per one input file will be
generated in system.img, with a suffix ".fsv_meta". e.g. a container
file for "system/framework/foo.jar" will be
"system/framework/foo.jar.fsv_meta".

Bug: 193113311
Test: build with PRODUCT_SYSTEM_FSVERITY_GENERATE_METADATA := true
Change-Id: Ib70d591a72d23286b5debcb05fbad799dfd79b94
2021-11-11 17:30:19 +09:00
Treehugger Robot
180720602f Merge "Record ALL_DEPS by default." am: 372d74a8c9 am: 44ce81a207 am: 97e85dcf4a
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: Ie3857d2cbe402003f02981aaf21bfd0217d4725d
2021-11-11 05:22:48 +00:00
Eric Miao
4f869bee85 Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f am: 2a03d646ca
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: If1747d49ea9a6244e2c70fea5eb6578a35243d5e
2021-11-11 05:22:34 +00:00
Treehugger Robot
97e85dcf4a Merge "Record ALL_DEPS by default." am: 372d74a8c9 am: 44ce81a207
Original change: https://android-review.googlesource.com/c/platform/build/+/1878199

Change-Id: I64c344b6069423316a0cf6d5cf61f61fb0e8ad70
2021-11-11 05:04:51 +00:00
Eric Miao
2a03d646ca Merge "Add oatdump and dexdump to dexpreopt_tools.zip" am: 6f2d435d8d am: caddb0004f
Original change: https://android-review.googlesource.com/c/platform/build/+/1883261

Change-Id: I5e8f59370d51845a84e2e4964ec63b88996785ee
2021-11-11 05:04:44 +00:00
Treehugger Robot
372d74a8c9 Merge "Record ALL_DEPS by default." 2021-11-11 04:48:16 +00:00
Eric Miao
6f2d435d8d Merge "Add oatdump and dexdump to dexpreopt_tools.zip" 2021-11-11 04:30:27 +00:00
Jim Tang
5c6410edee Record ALL_DEPS by default.
Abandon the use of RECORD_ALL_DEPS to record ALL_DEPS.

BUG: 204397180

Test: m, and inspect module-info.json.
Change-Id: Iaf35580b52c11ad37017b1fb8e0937b859d3f55b
2021-11-11 10:24:51 +08:00
Treehugger Robot
a7b02fdb27 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde am: f5b59967b4 am: 3ac2ecaff6
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I120a8a133715209dbc5c8c19cf0ef8665924896a
2021-11-11 00:24:43 +00:00
Treehugger Robot
3ac2ecaff6 Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" am: 7bd2d13cde am: f5b59967b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1885789

Change-Id: I9a438d7e43488e6c68a0d9686d6760642d2c220b
2021-11-11 00:13:12 +00:00
Treehugger Robot
7bd2d13cde Merge "Fix BOARD_SYSTEMSDK_VERSIONS checks" 2021-11-10 23:38:28 +00:00
Cole Faust
40886414ba Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6 am: 7e00224e10
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I46f84d4796b9d586e713c2919c8e5a0afaeefed9
2021-11-10 20:59:27 +00:00
Cole Faust
7e00224e10 Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I6b948b9535e93af86578e90e36e203b44f686f4d
2021-11-10 20:41:27 +00:00
Cole Faust
e856367da1 Merge "Add soong_config_get" 2021-11-10 19:46:48 +00:00
Treehugger Robot
64b04c716e Merge changes from topic "soong-java-install" am: 585ec03c47 am: 7be9f15f4b am: ce754c6762
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: I84deb185f2bab6590802b81becb78ef0d3ef20c8
2021-11-10 17:52:39 +00:00
Treehugger Robot
ce754c6762 Merge changes from topic "soong-java-install" am: 585ec03c47 am: 7be9f15f4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1880594

Change-Id: I2cf1cc74ad59eaea3e93004a40511e4ffd721c2e
2021-11-10 17:41:24 +00:00
Anton Hansson
6537f5fc66 Merge "Fix product single value variables failed issue" am: 0e21221d30 am: 1564e90a14 am: ec88e00164
Original change: https://android-review.googlesource.com/c/platform/build/+/1885408

Change-Id: Ib8c1764ecf0553502e839430ca53570d54c1ce6c
2021-11-10 17:33:50 +00:00
Anton Hansson
ec88e00164 Merge "Fix product single value variables failed issue" am: 0e21221d30 am: 1564e90a14
Original change: https://android-review.googlesource.com/c/platform/build/+/1885408

Change-Id: Ifdfcce9f72ad6053a6ba9284c356203a4585c01b
2021-11-10 17:17:05 +00:00
Treehugger Robot
585ec03c47 Merge changes from topic "soong-java-install"
* changes:
  Move java install rules into Soong
  Don't create compatibility suite copy rules for installed path
2021-11-10 17:05:51 +00:00
Anton Hansson
0e21221d30 Merge "Fix product single value variables failed issue" 2021-11-10 16:45:36 +00:00
Cole Faust
70a886c7ce Add soong_config_get
Having a function to get soong config variables
makes it easier to convert to starlark.

Bug: 201700692
Test: m RBC_PRODUCT_CONFIG=1 RBC_BOARD_CONFIG=1 nothing and check output files
Change-Id: I8627555df10d3f66f6154c00be9f0565076f1f94
2021-11-09 17:09:04 -08:00
Justin Yun
e81ec6960a Fix BOARD_SYSTEMSDK_VERSIONS checks
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
2021-11-10 00:34:17 +00:00
Eric Miao
1d0fd2cb91 Add oatdump and dexdump to dexpreopt_tools.zip
Change-Id: If7615e1da24bcb819f595adb88060b164499a598
2021-11-09 18:53:39 +00:00
Treehugger Robot
25a7176c8e Merge "Add missing dependency from module name to symlinks" am: a421192568 am: dcb9d51f9d am: be4ee8430d
Original change: https://android-review.googlesource.com/c/platform/build/+/1883262

Change-Id: I50635f6c75475763be2b5655d49f618e4383b39c
2021-11-09 12:23:10 +00:00
Treehugger Robot
be4ee8430d Merge "Add missing dependency from module name to symlinks" am: a421192568 am: dcb9d51f9d
Original change: https://android-review.googlesource.com/c/platform/build/+/1883262

Change-Id: Ifd61199a54b90f16664206c15f626ad1157e31cc
2021-11-09 12:02:14 +00:00
liulvping
689c3fb5d7 Fix product single value variables failed issue
Test: source & lunch & make

Signed-off-by: liulvping <liulvping@xiaomi.com>
Change-Id: Idd0e1c561504afb7c7fef4242b3b122cba220ed0
2021-11-09 02:05:25 +00:00
Colin Cross
47cfffea79 Move java install rules into Soong
Remove the copy rules for LOCAL_SOONG_BUILT_INSTALLED, they will already
be created by Soong.

Also clean the soong host tools directory to remove any old copies of
java binaries.

Bug: 204136549
Test: m checkbuild
Change-Id: Ib6b5362ad59aa48770e48541430d6857846926c2
2021-11-08 15:23:32 -08:00
Colin Cross
a69b809425 Don't create compatibility suite copy rules for installed path
Don't create compatibility suite copy rules for $(LOCAL_BUILT_MODULE)
to $(LOCAL_INSTALLED_MODULE), as that could conflict with a Soong
install rule.  Instead, always create the install rule the normal way,
and replace the compatibility suite copy rule with a noop if it is the
same as the normal rule.

Bug: 204136549
Test: m checkbuild
Change-Id: Ic8ac80eda8554fae2b7ecc2516165da020bdaebe
2021-11-08 15:23:32 -08:00
Colin Cross
d954ea888a Add missing dependency from module name to symlinks
The rules to install the symlinks had dependencies from PRODUCT_PACKAGES
install rules, but from manual install requests like `m toybox`.  Add
the missing dependencies.  Also add the new declare-0p-target licensing
call.

Fixes: 205524422
Test: m toybox
Change-Id: Ie9a5e37b09250aa271ab153a13f41bc34fa4a38a
2021-11-08 19:40:22 +00:00
Anton Hansson
a30862edcf Merge "Do not disable prebuilts for sdk builds" am: db7732900b am: e637223368 am: 14d40d1d31
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: If94283e72318b9c0c4c7f6a9b6b461deb92b8d13
2021-11-08 11:23:54 +00:00
Anton Hansson
14d40d1d31 Merge "Do not disable prebuilts for sdk builds" am: db7732900b am: e637223368
Original change: https://android-review.googlesource.com/c/platform/build/+/1881856

Change-Id: I5a6c9c22f4a6a78aff336e18caf7c8f6cca22351
2021-11-08 11:05:26 +00:00
Anton Hansson
db7732900b Merge "Do not disable prebuilts for sdk builds" 2021-11-08 10:27:22 +00:00
Cole Faust
639aa227b9 Merge "Make starlark board configuration work with sdk_phone_x86_64" am: 2f1bd70c9c am: 8df9e5c1c2 am: 286c0c11b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1849978

Change-Id: Ica9b63e2ecfa180d15882954bc47c0e6bc4a38d2
2021-11-05 19:47:34 +00:00
Cole Faust
c2becd087a Disallow setting LOCAL_MODULE_STEM for android packages
LOCAL_MODULE_STEM is not used in the packaging code,
except when setting PACKAGES.$(LOCAL_MODULE).STEM.
Having this disconnect between PACKAGES.$(LOCAL_MODULE).STEM
and the actual name of the apk causes an apk signing
step to fail.

Other module types like BUILD_HEADER_LIBRARY explicetly
disallow setting LOCAL_MODULE_STEM, so we can also just
do that for packages.

Fixes: 204027319
Test: Presubmits
Change-Id: Ib3da9a8dd6792a6c9d725cb24b835b32dbb13c40
2021-11-05 12:35:18 -07:00