Commit Graph

28743 Commits

Author SHA1 Message Date
Cole Faust
d3522e842e Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390 am: 638472caa8
Original change: https://android-review.googlesource.com/c/platform/build/+/1900878

Change-Id: Ic9ca6e05baa054cf124a7f95628b22d69436f513
2021-11-25 01:42:52 +00:00
Cole Faust
638472caa8 Merge "Change type of TARGET_BUILD_APPS from bool to list" am: 7d9103b390
Original change: https://android-review.googlesource.com/c/platform/build/+/1900878

Change-Id: Ib21e3dc644b5930403dd42c7a47a01b916cb918b
2021-11-25 01:27:02 +00:00
Cole Faust
7d9103b390 Merge "Change type of TARGET_BUILD_APPS from bool to list" 2021-11-25 01:06:53 +00:00
Treehugger Robot
ce3b3de281 Merge "Exclude predefined variables from board config" am: 359665674f am: 2694a33cb6
Original change: https://android-review.googlesource.com/c/platform/build/+/1900875

Change-Id: I36ec5d6af7442059c6f88713c34efab07b030dfc
2021-11-24 21:08:34 +00:00
Treehugger Robot
2694a33cb6 Merge "Exclude predefined variables from board config" am: 359665674f
Original change: https://android-review.googlesource.com/c/platform/build/+/1900875

Change-Id: If9850339861ea48042a2c397294303430efac819
2021-11-24 20:48:28 +00:00
Treehugger Robot
359665674f Merge "Exclude predefined variables from board config" 2021-11-24 20:30:00 +00:00
Treehugger Robot
0d780c6218 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I9ad6fe383299e876ac1ec2a6fe29cc17ed45662c
2021-11-24 20:02:59 +00:00
TreeHugger Robot
af8e9715a1 Merge "[DO NOT MERGE] am: 9e20227ea5" into sc-qpr1-dev-plus-aosp 2021-11-24 20:02:36 +00:00
Treehugger Robot
3f8601901a Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I0ec4ccb90656eb52aca495a4da7ba64c033418df
2021-11-24 19:34:15 +00:00
Paul Scovanner
44591c2a8a [DO NOT MERGE] am: 9e20227ea5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16299320

Change-Id: Ia0ef9b884afe4de7b347a098816409f984173c56
2021-11-24 18:32:21 +00:00
Ulya Trafimovich
00496c1683 Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically.
This is needed because product makefiles may need to add their own
system server jars to this variable, and they cannot insert them in
the correct alphabetical order on the list. So it needs to be sorted
automatically. Do this after processing all product makefiles and
populating the variable, but before passing it to Soong.

Bug: 207474880
Test: atest art_standalone_dexpreopt_tests:art_standalone_dexpreopt_tests.DexpreoptTest#ForSystemServer
Change-Id: I80dbf555c395c92539c506d3d8b1f2f101a58bce
2021-11-24 15:41:49 +00:00
Nahian Ashraf
ab77473ace DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 15:16:59 +09:00
Treehugger Robot
9680501cc8 Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" 2021-11-24 05:35:08 +00:00
Nahian Ashraf
f41bff99b3 DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 03:34:07 +00:00
Cole Faust
5588a88969 Change type of TARGET_BUILD_APPS from bool to list
TARGET_BUILD_APPS is supposed to be a list of apps to
build, so having it be a bool was incorrect. Change it
to properly reflect what it is, because the starlark
product configuration relies on soong's interpretation
of variables types.

Bug: 201700692
Test: Presubmits
Change-Id: I00109b57abbcda86077f0465f982f54b4a77a7f0
2021-11-23 19:04:11 -08:00
Jiyong Park
faf9b72cd3 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334 am: c28911dd2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: Ibc7bfd843c169db507123069ce7237fcccb747a5
2021-11-24 02:26:16 +00:00
Jiyong Park
c28911dd2a Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: I4c3fdafa50465bd050dbf3ef9e873e0e9fb0ff7c
2021-11-24 02:00:55 +00:00
Jiyong Park
4d7ddff334 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-11-24 01:43:19 +00:00
Cole Faust
be6d5f13b2 Exclude predefined variables from board config
mk2rbc has a few predefined variables that can't be
set in the product/board config makefiles, unless they're
set to their predefined values. Exclude these variables
from the board config input variables so that they don't
conflict.

Bug: 201700692
Test: m RBC_BOARD_CONFIG=1 mainline_system_x86_64-userdebug (ninja files differ still but this fixes a compilation error)
Change-Id: Idc11b2c5029d28116236b289ad1f09afaaf83cc3
2021-11-23 16:45:29 -08:00
Cole Faust
4cb47e64a9 Merge "Return product config variables from board_configuration" am: 4228f8f7a3 am: 390d1e0795
Original change: https://android-review.googlesource.com/c/platform/build/+/1900113

Change-Id: I8471bbd689cde2bd9d37cd7ca68f5842a349c323
2021-11-23 21:22:21 +00:00
Cole Faust
390d1e0795 Merge "Return product config variables from board_configuration" am: 4228f8f7a3
Original change: https://android-review.googlesource.com/c/platform/build/+/1900113

Change-Id: I36ebee83203c28d40498ca85935b662e222f317a
2021-11-23 21:04:27 +00:00
Cole Faust
4228f8f7a3 Merge "Return product config variables from board_configuration" 2021-11-23 20:46:45 +00:00
Treehugger Robot
e1c4d9dd2b Merge "Disallow setting LOCAL_MODULE_STEM for android packages" am: 55870dd500 am: 871500d4b6
Original change: https://android-review.googlesource.com/c/platform/build/+/1880753

Change-Id: Ieb08b50f9548ae60b2dc5d63e2be33924a11222f
2021-11-23 05:47:46 +00:00
Treehugger Robot
871500d4b6 Merge "Disallow setting LOCAL_MODULE_STEM for android packages" am: 55870dd500
Original change: https://android-review.googlesource.com/c/platform/build/+/1880753

Change-Id: I60ebc76a554355e48e0ee6b6d3d3a716ed842b3d
2021-11-23 05:36:16 +00:00
Treehugger Robot
55870dd500 Merge "Disallow setting LOCAL_MODULE_STEM for android packages" 2021-11-23 05:21:15 +00:00
Cole Faust
f0d7d8ff73 Return product config variables from board_configuration
The board config can actually change a few product config
variables that are not made read-only.

Bug: 201700692
Test: ./build/bazel/ci/rbc_regression_test.sh -b aosp_cf_x86_64_phone
Change-Id: Ib2ac04ac2c5a56d32bca51fc8189e44e180075ee
2021-11-22 16:31:46 -08:00
Paul Scovanner
9e20227ea5 [DO NOT MERGE]
Update Security String to 2022-01-05

Bug: 207022948
Change-Id: Ie4afce5ae2b2a1b60fb0fc78ea014d220e08a981
2021-11-22 21:45:58 +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
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
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
Colin Cross
da166c5ad4 Make SOONG_HOST_OUT an alias for HOST_OUT
Soong now installs to the same directory as Make, point SOONG_HOST_OUT
at HOST_OUT.

Bug: 204136549
Test: m checkbuild
Change-Id: I49bfc0466056d270c8023288a6fe778c3445a900
2021-11-18 16:26:58 -08: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
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
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
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