diff options
| author | Jeffrey Vander Stoep <jeffv@google.com> | 2017-07-13 00:34:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-13 00:34:03 +0000 |
| commit | 9a4e869abd0b9d86fa1f89881ebe9690164b99f4 (patch) | |
| tree | 328e29ad42ac64456f07c834451a1a7f5ea3927b | |
| parent | f0e73ecc7e48bd2cfa78d06406cfaacd58a9abc8 (diff) | |
| parent | ca99c842bcc397d0cce1fca019dc7971f7cecc27 (diff) | |
| download | toybox-9a4e869abd0b9d86fa1f89881ebe9690164b99f4.tar.gz | |
Revert "Fix toybox_vendor dependencies on libselinux_vendor." am: cf90d7eb8f am: 3391276ee0 am: d9729a74e0
am: ca99c842bc
Change-Id: If86f631e78f24d8f88b3b621fc4794a3f44a93aa
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -228,11 +228,7 @@ toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p toybox_version := $(toybox_upstream_version)-android -toybox_common_libraries := liblog libcutils libcrypto libz - -toybox_libraries := $(toybox_common_libraries) libselinux - -toybox_vendor_libraries := $(toybox_common_libraries) libselinux_vendor +toybox_libraries := liblog libselinux libcutils libcrypto libz common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\" @@ -410,7 +406,7 @@ LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGE include $(BUILD_EXECUTABLE) ############################################ -# toybox for /vendor +# static version to be installed in /vendor ############################################ include $(CLEAR_VARS) @@ -418,8 +414,11 @@ LOCAL_MODULE := toybox_vendor LOCAL_VENDOR_MODULE := true LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS := $(common_CFLAGS) -LOCAL_SHARED_LIBRARIES := $(toybox_vendor_libraries) +LOCAL_STATIC_LIBRARIES := $(toybox_libraries) +# libc++_static is needed by static liblog +LOCAL_CXX_STL := libc++_static 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) |