diff options
| author | Yifan Hong <elsk@google.com> | 2017-07-14 19:42:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-14 19:42:50 +0000 |
| commit | ee334adcef7bdddb2e4dc7106a2a3b86a88a703e (patch) | |
| tree | 9df201b76344e5c0889a8f99cd07ba62c16033a1 | |
| parent | 9a4e869abd0b9d86fa1f89881ebe9690164b99f4 (diff) | |
| parent | abcc51fc3bd78f052192817139b16f0b84d42155 (diff) | |
| download | android_external_toybox-ee334adcef7bdddb2e4dc7106a2a3b86a88a703e.tar.gz android_external_toybox-ee334adcef7bdddb2e4dc7106a2a3b86a88a703e.tar.bz2 android_external_toybox-ee334adcef7bdddb2e4dc7106a2a3b86a88a703e.zip | |
Fix toybox_vendor dependencies again. am: 2211432f50 am: 2491131bd4 am: 35c8dee8cf
am: abcc51fc3b
Change-Id: I42ca96137f6e9f4aef500f63bf1082fe3a002f46
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -406,7 +406,7 @@ LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGE include $(BUILD_EXECUTABLE) ############################################ -# static version to be installed in /vendor +# toybox for /vendor ############################################ include $(CLEAR_VARS) @@ -414,11 +414,9 @@ LOCAL_MODULE := toybox_vendor LOCAL_VENDOR_MODULE := true LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS := $(common_CFLAGS) -LOCAL_STATIC_LIBRARIES := $(toybox_libraries) -# libc++_static is needed by static liblog -LOCAL_CXX_STL := libc++_static +LOCAL_STATIC_LIBRARIES := libcutils libcrypto libz +LOCAL_SHARED_LIBRARIES := libselinux_vendor liblog LOCAL_MODULE_TAGS := optional -LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf ${LOCAL_MODULE} $(TARGET_OUT_VENDOR_EXECUTABLES)/$(t);) include $(BUILD_EXECUTABLE) |