Merge changes I4f04b058,Ia2d97568 am: ab8690cfd7 am: 3e85b9ede2 am: b564b1c5c6 am: b99c42f41c

Original change: https://android-review.googlesource.com/c/platform/prebuilts/runtime/+/2060064

Change-Id: I7cc041aa80ef484f13b357f55e73623b8ac3bc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9 files changed, 5 insertions, 13 deletions

diff --git a/mainline/runtime/host-exports/licenses/build/soong/licenses/LICENSE b/mainline/runtime/host-exports/licenses/build/soong/licenses/LICENSE
index dae04065..d6456956 100644
--- a/mainline/runtime/host-exports/licenses/build/soong/licenses/LICENSE
+++ b/mainline/runtime/host-exports/licenses/build/soong/licenses/LICENSE
@@ -1,16 +1,4 @@
 
-   Copyright (c) The Android Open Source Project
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
diff --git a/mainline/runtime/host-exports/linux_bionic/x86_64/bin/linkerconfig b/mainline/runtime/host-exports/linux_bionic/x86_64/bin/linkerconfig
index fca95ad3..e66a6036 100755
--- a/mainline/runtime/host-exports/linux_bionic/x86_64/bin/linkerconfig
+++ b/mainline/runtime/host-exports/linux_bionic/x86_64/bin/linkerconfig
diff --git a/mainline/runtime/host-exports/linux_glibc/x86_64/bin/linkerconfig b/mainline/runtime/host-exports/linux_glibc/x86_64/bin/linkerconfig
index e094e4e4..0bd5fa4c 100755
--- a/mainline/runtime/host-exports/linux_glibc/x86_64/bin/linkerconfig
+++ b/mainline/runtime/host-exports/linux_glibc/x86_64/bin/linkerconfig
diff --git a/mainline/runtime/host-exports/x86_64/bin/linker64 b/mainline/runtime/host-exports/x86_64/bin/linker64
index f735e757..0fd5f818 100755
--- a/mainline/runtime/host-exports/x86_64/bin/linker64
+++ b/mainline/runtime/host-exports/x86_64/bin/linker64
diff --git a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_dynamic.o b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_dynamic.o
index 41616288..f6e5db90 100644
--- a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_dynamic.o
+++ b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_dynamic.o
diff --git a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_so.o b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_so.o
index 216271bc..64c03d41 100644
--- a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_so.o
+++ b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtbegin_so.o
diff --git a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend.o b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend.o
index 3233f21a..c9e8a091 100644
--- a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend.o
+++ b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend.o
diff --git a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend_so.o b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend_so.o
index 22b28279..2f126fa9 100644
--- a/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend_so.o
+++ b/mainline/runtime/sdk/linux_bionic/x86_64/lib/crtend_so.o
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') +