diff options
| author | Martin Stjernholm <mast@google.com> | 2019-11-11 15:33:22 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2019-11-21 16:15:20 +0000 |
| commit | 3274cc4692aa636471ad4ea0ae5f5e81d3552b14 (patch) | |
| tree | bdcffefcde2c3f65ae8ad5a3ea8710877a929615 /CleanSpec.mk | |
| parent | 2a8bca749533dcefabff497d4f7346a35601a702 (diff) | |
| download | bionic-3274cc4692aa636471ad4ea0ae5f5e81d3552b14.tar.gz | |
Reland "Add libdl_android to the Runtime (aka Bionic) APEX".
Before this it ended up in /system.
Test: build & boot
Test: adb shell find system apex -name libdl_android.so | xargs adb shell ls -l
=>
apex/com.android.runtime/lib/bionic/libdl_android.so
apex/com.android.runtime/lib64/bionic/libdl_android.so
apex/com.android.runtime@1/lib/bionic/libdl_android.so
apex/com.android.runtime@1/lib64/bionic/libdl_android.so
system/lib/bootstrap/libdl_android.so
system/lib/libdl_android.so -> /apex/com.android.runtime/lib/bionic/libdl_android.so
system/lib64/bootstrap/libdl_android.so
system/lib64/libdl_android.so -> /apex/com.android.runtime/lib64/bionic/libdl_android.so
Test: atest CtsBionicTestCases
Test: Repro in b/144343305#comment8 together with ag/9754153
Bug: 135753770
Bug: 144343305
Change-Id: I9ccd10b711223ca474e91741711b7b8efd521b2d
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 88657234b..e8dd26c41 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -57,6 +57,11 @@ $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib64/libGLES*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/bionic) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/bionic) +# Ensure libdl_android.so is (only) in the correct locations after the move into +# the Runtime APEX. +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/apex/com.android.runtime/lib{,64}) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib{,64}) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |