Revert "Build and use minadbd as a shared library."
This reverts commit 4fd4f89591.
The reverted CL has a side effect that unintentionally installs
a copy of libminadbd_services.so to the system image. This breaks the
check with `build/soong/build_test.bash --dist` which detects and
prevents vendor modules from installing files to the system image.
Prior to fully converting `recovery` to be built with Soong, we have to
statically link recovery-specific modules into `recovery`.
Bug: 110380063
Test: `m -j bootimage` with aosp_marlin-userdebug
Test: Run minadbd_test on marlin.
Test: Boot into recovery and verify that sideloading still works.
Test: `build/soong/build_test.bash --dist`
Change-Id: I290d55c82e17aa60a5afdf2ff7f896afc4dae8b3
This commit is contained in:
+1
-6
@@ -127,6 +127,7 @@ health_hal_static_libraries := \
|
||||
librecovery_static_libraries := \
|
||||
libbootloader_message \
|
||||
libfusesideload \
|
||||
libminadbd \
|
||||
libminui \
|
||||
libverifier \
|
||||
libotautil \
|
||||
@@ -169,9 +170,6 @@ LOCAL_CFLAGS := $(recovery_common_cflags)
|
||||
|
||||
LOCAL_MODULE := librecovery
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libminadbd_services \
|
||||
|
||||
LOCAL_STATIC_LIBRARIES := \
|
||||
$(librecovery_static_libraries)
|
||||
|
||||
@@ -201,7 +199,6 @@ LOCAL_STATIC_LIBRARIES := \
|
||||
$(librecovery_static_libraries)
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libminadbd_services \
|
||||
librecovery_ui \
|
||||
|
||||
LOCAL_HAL_STATIC_LIBRARIES := libhealthd
|
||||
@@ -239,9 +236,7 @@ LOCAL_REQUIRED_MODULES += \
|
||||
# module is built with Soong (with `recovery: true` flag).
|
||||
LOCAL_REQUIRED_MODULES += \
|
||||
libbase.recovery \
|
||||
libcrypto.recovery \
|
||||
liblog.recovery \
|
||||
libminadbd_services.recovery \
|
||||
libpng.recovery \
|
||||
libz.recovery \
|
||||
|
||||
|
||||
Reference in New Issue
Block a user