リビジョン | 75cf36a200cbb74b9d7bce1e9afe018f02d9bc1d (tree) |
---|---|
日時 | 2017-07-13 16:33:10 |
作者 | android-build-team Robot <android-build-team-robot@goog...> |
コミッター | android-build-team Robot |
release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352
Change-Id: I803ffa7f14c515c5a09c567db04c66d1521ef8c1
@@ -228,11 +228,7 @@ toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p | ||
228 | 228 | |
229 | 229 | toybox_version := $(toybox_upstream_version)-android |
230 | 230 | |
231 | -toybox_common_libraries := liblog libcutils libcrypto libz | |
232 | - | |
233 | -toybox_libraries := $(toybox_common_libraries) libselinux | |
234 | - | |
235 | -toybox_vendor_libraries := $(toybox_common_libraries) libselinux_vendor | |
231 | +toybox_libraries := liblog libselinux libcutils libcrypto libz | |
236 | 232 | |
237 | 233 | common_CFLAGS += -DTOYBOX_VERSION=\"$(toybox_version)\" |
238 | 234 |
@@ -410,7 +406,7 @@ LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf toybox $(TARGE | ||
410 | 406 | include $(BUILD_EXECUTABLE) |
411 | 407 | |
412 | 408 | ############################################ |
413 | -# toybox for /vendor | |
409 | +# static version to be installed in /vendor | |
414 | 410 | ############################################ |
415 | 411 | |
416 | 412 | include $(CLEAR_VARS) |
@@ -418,8 +414,11 @@ LOCAL_MODULE := toybox_vendor | ||
418 | 414 | LOCAL_VENDOR_MODULE := true |
419 | 415 | LOCAL_SRC_FILES := $(common_SRC_FILES) |
420 | 416 | LOCAL_CFLAGS := $(common_CFLAGS) |
421 | -LOCAL_SHARED_LIBRARIES := $(toybox_vendor_libraries) | |
417 | +LOCAL_STATIC_LIBRARIES := $(toybox_libraries) | |
418 | +# libc++_static is needed by static liblog | |
419 | +LOCAL_CXX_STL := libc++_static | |
422 | 420 | LOCAL_MODULE_TAGS := optional |
421 | +LOCAL_FORCE_STATIC_EXECUTABLE := true | |
423 | 422 | LOCAL_POST_INSTALL_CMD := $(hide) $(foreach t,$(ALL_TOOLS),ln -sf ${LOCAL_MODULE} $(TARGET_OUT_VENDOR_EXECUTABLES)/$(t);) |
424 | 423 | include $(BUILD_EXECUTABLE) |
425 | 424 |