Commit Graph

28824 Commits

Author SHA1 Message Date
Martin Stjernholm
e7309cea6d Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 am: cffbc40ea9
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I6eaf49afa42e1f6ee037b080af0f3cd00e2e08e5
2021-11-22 14:45:08 +00:00
Martin Stjernholm
cffbc40ea9 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: Ib55f87b43a0d6a7a4c7189958695f6f97383c520
2021-11-22 14:35:46 +00:00
Martin Stjernholm
382d8ae9c4 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I4f7a2e3c953e65d756f2eec9d7afdc033187682c
2021-11-22 14:24:16 +00:00
Martin Stjernholm
91964c82e3 Configure boot image profiles for platform and unbundled ART module
builds (reland).

- Use art/build/boot/boot-image-profile.txt for the primary boot image
  in the ART module, both when it's built from source in platform and
  as an unbundled module.

- Use frameworks/base/boot/boot-image-profile.txt for the framework
  extension image in platform, but not in unbundled builds.

This should obsolete the combined profile
frameworks/base/config/boot-image-profile.txt.

This relands https://r.android.com/1881863 with a fix to allow multiple
values on PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION.

Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints both art/build/boot/boot-image-profile.txt
  and frameworks/base/boot/boot-image-profile.txt in a platform build
  on master.
Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints only art/build/boot/boot-image-profile.txt
  in an unbundled build on master-art.
Test: banchan com.android.art && m
  on master-art and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  shrinks from 14 MB to 4.7.
Test: m droid
  on master together with https://r.android.com/1895131 and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  and out/target/product/vsoc_x86_64/system/framework/x86_64/boot-framework.oat
  are identical.
Test: lunch armv8-eng && art/tools/buildbot-build.sh
  on master-art
Bug: 174746397
Change-Id: I9114271bc69cf0888150b2c778a086bc50b73045
2021-11-19 16:21:37 +00:00
Treehugger Robot
bc0cc5d62c Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d am: 5499092f0e
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: I81240fec66d2fdfe78386d4da304af95535b06d6
2021-11-19 04:02:05 +00:00
Treehugger Robot
5499092f0e Merge "Update conversion results file only when it changed." am: 9a991fab04 am: f15629526d
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: Iff544e80dd0ea88fd62bb4008aea81bb80b3d1b4
2021-11-19 03:45:49 +00:00
Treehugger Robot
f15629526d Merge "Update conversion results file only when it changed." am: 9a991fab04
Original change: https://android-review.googlesource.com/c/platform/build/+/1896415

Change-Id: Ic198132d5816ffd0e33bf07f6c9116fa8618e0e8
2021-11-19 03:32:11 +00:00
Colin Cross
546543bcd1 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad am: 013b1ee778 am: de84cc8b72
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: Ie780d096a44162d153298066e94a82ef50005111
2021-11-19 03:19:03 +00:00
Treehugger Robot
9a991fab04 Merge "Update conversion results file only when it changed." 2021-11-19 03:12:12 +00:00
Colin Cross
de84cc8b72 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad am: 013b1ee778
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: I40432b5f40c6c403f30e3ae55b76cffce6da155a
2021-11-19 02:58:27 +00:00
Colin Cross
013b1ee778 Merge "Extract primary APK from apk sets in Soong" am: 345da983ad
Original change: https://android-review.googlesource.com/c/platform/build/+/1893500

Change-Id: Ib27dd9280f1aeabe0ba1f201518b0a8db06f0215
2021-11-19 02:33:56 +00:00
Colin Cross
345da983ad Merge "Extract primary APK from apk sets in Soong" 2021-11-19 02:18:20 +00:00
Sasha Smundak
7dc8f486c2 Update conversion results file only when it changed.
Test: treehugger
Change-Id: Ia0d6bf614fa0714a977b2880f7271d54df034366
2021-11-18 15:17:59 -08:00
Treehugger Robot
72cc63b159 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 am: 2d04577ee7 am: e116a5d35b
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: I9611c2cc48633c1be5ace78f10e702a4c2354294
2021-11-18 23:03:57 +00:00
Treehugger Robot
e116a5d35b Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6 am: 2d04577ee7
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: Ife5f0bbe246316490fc88feb1a352062d7a19f16
2021-11-18 22:46:45 +00:00
Treehugger Robot
2d04577ee7 Merge changes from topics "dist_for_goals", "mk2star" am: 613ae210f6
Original change: https://android-review.googlesource.com/c/platform/build/+/1890801

Change-Id: I9dbe243c6941b04fe8262e59c072fa6a2839d0e2
2021-11-18 22:23:49 +00:00
Xin Li
0d8b812568 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:28:37 +00:00
Sasha Smundak
c20dd972a9 Runtime reporting of the conversion errors.
Bug: 204062171
Test: rbcrun build/make/tests/conversion_error.rbc (displays a message, stops)
  rbcrun RBC_MK2RBC_CONTINUE=t build/make/tests/conversion_error.rbc  (displays a message and continues)
Change-Id: Idf0fe6bbb08b1eca1f392d81950eed4a214f3289
2021-11-18 11:27:55 -08:00
Sasha Smundak
91fc734100 Runtime support for dist-for-goals.
Convert dist-for-goals.

Bug: 198496782
Test: rbcrun build/make/tests/run.rbc
Change-Id: I46ef9e897143aecf8bd28ad8569d48e74530b0e5
2021-11-18 11:20:34 -08:00
Yifan Hong
c5785c29c9 Add recovery service_contexts. am: 276b8c0230 am: c59eeaa272 am: 935c6006b9
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: I2fe0051b27476c0b867458d6bb820ae8d9dde984
2021-11-18 05:34:45 +00:00
Yifan Hong
935c6006b9 Add recovery service_contexts. am: 276b8c0230 am: c59eeaa272
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: I9af984fb98bf4a32b2c90c301f22afa22b41dd12
2021-11-18 05:17:58 +00:00
Yifan Hong
c59eeaa272 Add recovery service_contexts. am: 276b8c0230
Original change: https://android-review.googlesource.com/c/platform/build/+/1891251

Change-Id: Ic397dc0036431b9bdb90ffbd2ba80f32288e1a6c
2021-11-18 05:01:37 +00:00
Yifan Hong
351cd2e489 Merge changes from topic "servicemanager-recovery"
* changes:
  Add servicemanager.recovery to base_vendor.mk.
  Add recovery service_contexts.
2021-11-18 04:39:14 +00:00
Colin Cross
f42c7d6be1 Extract primary APK from apk sets in Soong
In preparation for Soong handling the installation rules, extract
the primary APK from the apk set in Soong.

Bug: 204136549
Test: build test android_app_set
Change-Id: I416b57009101ca4c05c11102f260e102af13bf0d
2021-11-17 19:45:49 -08:00
Treehugger Robot
71a2325008 Merge "Add notdir implementation" am: dacbe7a5a2 am: f0cd91219d am: 74d752a5ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: Ie44e5860b349e36d0bc543de278fa85e7a3d1ce2
2021-11-17 21:47:48 +00:00
Treehugger Robot
74d752a5ea Merge "Add notdir implementation" am: dacbe7a5a2 am: f0cd91219d
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: I520fbca0f04163a44f5bbb686e1968db4bfab70f
2021-11-17 21:36:26 +00:00
Treehugger Robot
dacbe7a5a2 Merge "Add notdir implementation" 2021-11-17 20:58:24 +00:00
Cole Faust
0cc94d3275 Add notdir implementation
mk2rbc would already translate notdir calls,
but since there was no implementation it would
fail at runtime.

Bug: 201700692
Test: m rbcrun; rbcrun build/make/tests/run.rbc
Change-Id: Ie0f4e7b65448e612fa56f87b0bc138648cc0ad58
2021-11-17 10:50:14 -08:00
Cole Faust
f2d86f78b1 Merge "Don't assume _soong_config_namespaces_key is present" am: 8a7e9afc54 am: 35d5a4331c am: 242445d62c
Original change: https://android-review.googlesource.com/c/platform/build/+/1892960

Change-Id: Ife8372497edc97d0a9b35953a504a303f23a9cb0
2021-11-16 20:44:27 +00:00
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
Michael Wright
ce80edb3f6 Merge "Revert back to 12 instead of 12L" into sc-v2-dev-plus-aosp 2021-11-16 12:45:55 +00:00
Colin Cross
113dc5c9ac Merge "Translate BUILT_INSTALLED to LOCAL_BUILT_MODULE" am: d1c2c4e1b8 am: 23eafdab4c am: 4b89b964c7
Original change: https://android-review.googlesource.com/c/platform/build/+/1892959

Change-Id: Ic1a1f6cbbdb51912d5a0ca05735bd923906e709c
2021-11-16 00:55:08 +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
72afbf92c4 Merge "Always default to 1.9 for host java modules in Android.mk files" am: f1e1bcb0ee am: 4acd14b291 am: 35c2a2d115
Original change: https://android-review.googlesource.com/c/platform/build/+/1892956

Change-Id: I21031a4da9c30c3673f042f310c57582f4c23fba
2021-11-15 23:10:34 +00:00
Ivan Lozano
1b9d4e3254 Merge "Merge soong_{cc,rust}_prebuilt.mk" am: d59e23e2eb am: 77e40908fa am: ca8f517b40
Original change: https://android-review.googlesource.com/c/platform/build/+/1891055

Change-Id: I6e75b74cde87efff892deb58649a6e9a950d0608
2021-11-15 23:09:50 +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
Michael Wright
42f68fbf39 Revert back to 12 instead of 12L
Bug: 206132499
Bug: 204295952
Test: N/A
Change-Id: I7f87d189030e97f47dc81b756d1397b4aa65daf0
2021-11-15 21:23:01 +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
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
8702eff856 Merge "S V2 is now REL" into sc-v2-dev-plus-aosp 2021-11-12 17:44:52 +00:00
Treehugger Robot
53a0a19fef Merge changes from topic "fsverity_digest" am: 866d824328 am: f90fb54430 am: 173e8a3f90
Original change: https://android-review.googlesource.com/c/platform/build/+/1855993

Change-Id: Ib335c84762c9d743b29d20502e24db6be5443585
2021-11-12 07:19:55 +00: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