diff options
| author | Yifan Hong <elsk@google.com> | 2017-07-10 03:45:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-10 03:45:32 +0000 |
| commit | 537e6e363e7022923155288f03c1c497ebb8d7b7 (patch) | |
| tree | ee900ff5ccdb369d6458767e31686d25c7c28464 | |
| parent | a4f4fa78ebf9807a8bf885e3253bffe36a7c8f04 (diff) | |
| parent | 9e5e16264cf411f4efbb509e8df4630f4996a21a (diff) | |
| download | android_external_toybox-537e6e363e7022923155288f03c1c497ebb8d7b7.tar.gz android_external_toybox-537e6e363e7022923155288f03c1c497ebb8d7b7.tar.bz2 android_external_toybox-537e6e363e7022923155288f03c1c497ebb8d7b7.zip | |
Fix toybox_vendor dependencies on libselinux_vendor.
am: 9e5e16264c
Change-Id: Iace953ff7dff37810c5889fb8ebefb038ee5578a
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -228,7 +228,11 @@ toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p toybox_version := $(toybox_upstream_version)-android-$(BUILD_NUMBER_FROM_FILE) -toybox_libraries := liblog libselinux libcutils libcrypto libz +toybox_common_libraries := liblog libcutils libcrypto libz + +toybox_libraries := $(toybox_common_libraries) libselinux + +toybox_vendor_libraries := $(toybox_common_libraries) libselinux_vendor common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\" @@ -406,7 +410,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 +418,8 @@ 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_SHARED_LIBRARIES := $(toybox_vendor_libraries) 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) |