Commit graph

73344 commits

Author SHA1 Message Date
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
1ec033c132 Merge "Ensure there are no empty paths in ANDROID_BUILD_PATHS and PATH." am: 46bd6ec0f6
Original change: https://android-review.googlesource.com/c/platform/build/+/1900564

Change-Id: Ie54f123228059544b7e7e553696fdf545c5f4bd7
2021-11-24 20:03:10 +00:00
Treehugger Robot
46bd6ec0f6 Merge "Ensure there are no empty paths in ANDROID_BUILD_PATHS and PATH." 2021-11-24 19:39:33 +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
Treehugger Robot
03aa6cd538 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." 2021-11-24 19:13:31 +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
Martin Stjernholm
6a012266a1 Ensure there are no empty paths in ANDROID_BUILD_PATHS and PATH.
Test: lunch armv8
      - Check that PATH has no "::".
      - Check that an executable script in CWD doesn't get executed.
Change-Id: I3a97eb661c614ff2e09723e9ccca0bdeb63dbdc5
2021-11-24 14:59:15 +00:00
Treehugger Robot
72c70affba [automerger skipped] Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" am: 9680501cc8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/1900571

Change-Id: Idd9b0f93ea1a5ffd36247cf4d82f33f8e69efafb
2021-11-24 05:51:00 +00: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
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
Lingfeng Guan
c549841617 SignApk - change signature of readPassword to use char[] instead
Summary:
Use char[] is more conventional for password handling. See this question
for reference.
https://stackoverflow.com/questions/8881291

This is to address a concern raised in
https://android-review.googlesource.com/c/platform/build/+/1890395/2

Test: mma
Change-Id: I8d60efc557d7641c057e49a2aa4613fea67cd1e6
2021-11-23 23:53:08 +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
Michael Groover
5d6aa9a5b8 Merge "SignApk - support loading private keys from pkcs#11 keystore" am: 495fafef6f
Original change: https://android-review.googlesource.com/c/platform/build/+/1849654

Change-Id: Id612779ceba1f3a7bf1e38ce7ad6a0919ea68644
2021-11-23 20:22:53 +00:00
Lingfeng Guan
65672df61f SignApk - use existing password mechanism when using keystore
Summary:
In my last diff, I've added mechanism to load private key from keystore.
However, that mechanism will reveal password as part of the java param.
This diff tries to use existing ANDROID_PW_FILE mechanism to support
password for keystore private keys (through stdin)

This diff also fix a null pointer bug in the existing password handling

Test: This diff has been tested locally, and could sign correctly with our
  keystore with or without password

Tags:
Change-Id: Ie291ea8702a3b4d270b0f8689b023c3f290980a7
2021-11-23 12:02:16 -08:00
Michael Groover
495fafef6f Merge "SignApk - support loading private keys from pkcs#11 keystore" 2021-11-23 19:53:38 +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
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
f823ec6e99 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." 2021-11-22 14:10:54 +00:00
Treehugger Robot
6f017f5ecd Merge "Fix signapk not found error when running ota_from_target_files locally" am: 1fb1088e88
Original change: https://android-review.googlesource.com/c/platform/build/+/1894855

Change-Id: If708b86a46a486185cd2c571fa989260b476a4ca
2021-11-19 23:38:06 +00:00
Treehugger Robot
1fb1088e88 Merge "Fix signapk not found error when running ota_from_target_files locally" 2021-11-19 23:25:05 +00:00
Kelvin Zhang
4fc3aa0bc3 Fix signapk not found error when running ota_from_target_files locally
location of ota_from_target_files changed from
out/host/linux-x86/bin to
out/soong/host/linux-x86/bin . This changes relative position of
signapj.jar. To fix, use ANDROID_HOST_OUT as search path

Change-Id: I5397171566e9d7598b5ef16ae26641f0c183d748
2021-11-19 11:34:54 -08: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
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
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
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
Treehugger Robot
613ae210f6 Merge changes from topics "dist_for_goals", "mk2star"
* changes:
  Runtime reporting of the conversion errors.
  Runtime support for dist-for-goals.
2021-11-18 22:04:52 +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
207e7372e7 Merge changes from topic "servicemanager-recovery" am: 351cd2e489
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: Ief0f1635186a601d1875189aff0523e323486a8a
2021-11-18 05:01:38 +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
f0cd91219d Merge "Add notdir implementation" am: dacbe7a5a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1892961

Change-Id: I0ef3169d862bf1a767af04dfec164c6e6de05fdf
2021-11-17 21:15:52 +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
Android Build Coastguard Worker
8dc106e599 Version bump to SQ1A.211205.010 [core/build_id.mk]
Change-Id: I5a87dd2cefcfd7d6b46f5b1c536ab06b53a454c8
2021-11-17 18:23:35 +00:00
Cole Faust
35d5a4331c Merge "Don't assume _soong_config_namespaces_key is present" am: 8a7e9afc54
Original change: https://android-review.googlesource.com/c/platform/build/+/1892960

Change-Id: Ie81e7e2bf625b3b3540fad9c4dd66203185da91f
2021-11-16 20:04:03 +00:00