am b48c46bc: am 3cebf9f8: Merge "Add BSD false(1) and true(1)." (a024c2e7) · Commits · e / os / android_system_core

toolbox/Android.mk

+17 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,13 @@ LOCAL_MODULE := libtoolbox_du
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := upstream-freebsd/usr.bin/false/false.c
		LOCAL_CFLAGS += $(common_cflags) -Dmain=false_main
		LOCAL_MODULE := libtoolbox_false
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := \
		upstream-netbsd/usr.bin/grep/fastgrep.c \
		@@ -119,6 +126,13 @@ LOCAL_MODULE := libtoolbox_sync
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := upstream-freebsd/usr.bin/true/true.c
		LOCAL_CFLAGS += $(common_cflags) -Dmain=true_main
		LOCAL_MODULE := libtoolbox_true
		LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
		include $(BUILD_STATIC_LIBRARY)


		include $(CLEAR_VARS)

		@@ -128,6 +142,7 @@ BSD_TOOLS := \
		cp \
		dd \
		du \
		false \
		grep \
		kill \
		ln \
		@@ -137,6 +152,7 @@ BSD_TOOLS := \
		rmdir \
		sleep \
		sync \
		true \

		OUR_TOOLS := \
		chcon \
		@@ -246,8 +262,7 @@ $(TOOLS_H): $(LOCAL_PATH)/Android.mk
		$(TOOLS_H):
		$(transform-generated-source)

		# Make #!/system/bin/toolbox launchers for each tool.
		#
		# Make symbolic link launchers for each tool.
		SYMLINKS := $(addprefix $(TARGET_OUT)/bin/,$(ALL_TOOLS))
		$(SYMLINKS): TOOLBOX_BINARY := $(LOCAL_MODULE)
		$(SYMLINKS): $(LOCAL_INSTALLED_MODULE) $(LOCAL_PATH)/Android.mk

toolbox/upstream-freebsd/usr.bin/false/false.c

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 1988, 1993
		* The Regents of the University of California. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* 4. Neither the name of the University nor the names of its contributors
		* may be used to endorse or promote products derived from this software
		* without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
		* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
		* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		*/

		#ifndef lint
		static const char copyright[] =
		"@(#) Copyright (c) 1988, 1993\n\
		The Regents of the University of California. All rights reserved.\n";
		#endif /* not lint */

		#ifndef lint
		static const char sccsid[] = "@(#)false.c 8.1 (Berkeley) 6/6/93";
		#endif /* not lint */
		#include <sys/cdefs.h>
		__FBSDID("$FreeBSD$");

		int
		main(void)
		{
		return 1;
		}

toolbox/upstream-freebsd/usr.bin/true/true.c

0 → 100644

+46 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 1988, 1993
		* The Regents of the University of California. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* 1. Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* 2. Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in the
		* documentation and/or other materials provided with the distribution.
		* 4. Neither the name of the University nor the names of its contributors
		* may be used to endorse or promote products derived from this software
		* without specific prior written permission.
		*
		* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
		* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
		* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		*
		* $FreeBSD$
		*/

		#ifndef lint
		static const char copyright[] =
		"@(#) Copyright (c) 1988, 1993\n\
		The Regents of the University of California. All rights reserved.\n";
		#endif /* not lint */

		#ifndef lint
		static const char sccsid[] = "@(#)true.c 8.1 (Berkeley) 6/9/93";
		#endif /* not lint */

		int
		main(void)
		{
		return 0;
		}