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:

Tao Bao

2018-08-07 20:44:39 -07:00

parent 60924fa89a

commit c70446ce7b

4 changed files with 10 additions and 18 deletions

									
										tests/Android.mk
									
		+1
		-1
	
												View File
												
				@@ -170,7 +170,7 @@ librecovery_static_libraries := \

				    librecovery \

				    libbootloader_message \

				    libfusesideload \

				    libminadbd_services \

				    libminadbd \

				    librecovery_ui_default \

				    librecovery_ui \

				    libminui \