diff options
| author | Martin Stjernholm <mast@google.com> | 2022-04-12 20:14:52 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2022-04-12 20:20:42 +0100 |
| commit | a45f068a0933848a6537f02bc04a4f1d18ae8570 (patch) | |
| tree | 74d8af89b5af028ed0ce400e05f0da0bddcda9a5 | |
| parent | 5739413797cc546829fc2fd74d7ba51480c4673c (diff) | |
| download | runtime-a45f068a0933848a6537f02bc04a4f1d18ae8570.tar.gz | |
Enable Bionic host-exports together with the SDK.
They must always be dropped together. Added a comment to explain why,
because the error it gives otherwise is a bit confusing (cf.
b/228187970).
Test: prebuilts/runtime/mainline/update.py -b aosp-master --build 8376291
env TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng \
art/test/testrunner/run_build_test_target.py \
art-linux-bionic-x64
Bug: 228187970
Change-Id: Ia2d9756842cdedbf752de1437b183c75633b7320
| -rwxr-xr-x | mainline/update.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mainline/update.py b/mainline/update.py index 42448550..6fd96c33 100755 --- a/mainline/update.py +++ b/mainline/update.py @@ -96,8 +96,12 @@ PREBUILT_INSTALL_MODULES = ( # Runtime (Bionic) #InstallApexEntries('runtime', 'runtime/apex') + + # sdk and host-exports must always be updated together, because the linker + # and the CRT object files gets embedded in the binaries on linux host + # Bionic (see code and comments around host_bionic_linker_script in + # build/soong). InstallBundledSdkEntries('runtime', 'sdk') + - #InstallBundledSdkEntries('runtime', 'host-exports') + + InstallBundledSdkEntries('runtime', 'host-exports') + # I18N #InstallApexEntries('i18n', 'i18n/apex') + |