Revert "Fix toybox_vendor dependencies on libselinux_vendor." am: cf90d7eb8f

[android-x86/external-toybox.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 8f3698d..1048467 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -226,7 +226,7 @@ common_CFLAGS := \
 
 toybox_upstream_version := $(shell sed 's/#define.*TOYBOX_VERSION.*"\(.*\)"/\1/p;d' $(LOCAL_PATH)/main.c)
 
-toybox_version := $(toybox_upstream_version)-android-$(BUILD_NUMBER_FROM_FILE)
+toybox_version := $(toybox_upstream_version)-android
 
 toybox_libraries := liblog libselinux libcutils libcrypto libz
 
@@ -409,7 +409,6 @@ include $(BUILD_EXECUTABLE)
 # static version to be installed in /vendor
 ############################################
 
-ifeq ($(PRODUCT_FULL_TREBLE),true)
 include $(CLEAR_VARS)
 LOCAL_MODULE := toybox_vendor
 LOCAL_VENDOR_MODULE := true
@@ -422,7 +421,6 @@ 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)
-endif
 
 ############################################
 # static version to be installed in recovery