diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2017-07-10 07:51:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 07:51:14 +0000 |
| commit | 13c721a74c26e219552c14437926b0857c448237 (patch) | |
| tree | d3a5c4d89123b4a93d9181066d859b23f27942b9 | |
| parent | 3000b6574d0a09917b0d713334212375f4d94cf9 (diff) | |
| parent | 4ab405afe2668a5ca25be411df2d05a5e0995478 (diff) | |
| download | android_external_toybox-13c721a74c26e219552c14437926b0857c448237.tar.gz android_external_toybox-13c721a74c26e219552c14437926b0857c448237.tar.bz2 android_external_toybox-13c721a74c26e219552c14437926b0857c448237.zip | |
Revert "Fix toybox_vendor dependencies on libselinux_vendor."
am: 4ab405afe2
Change-Id: I8c945e89a3b56ffe9ce43f76bb294f91a74f9390
| -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-$(BUILD_NUMBER_FROM_FILE) -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) |