ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am d1d11fcb: Merge "Build the optional \'r\' tool separately."

Browse source 
* commit 'd1d11fcbe55ed7c7d49e857565fb2ec06ad5b54c':
  Build the optional 'r' tool separately.
This commit is contained in:
Elliott Hughes 2014-08-29 16:34:23 +00:00 • committed by Android Git Automerger
commit 61b4b8095a
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
toolbox/Android.mk
View file

@ -213,10 +213,6 @@ OUR_TOOLS := \
watchprops \ watchprops \
wipe \ wipe \
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
OUR_TOOLS += r
endif
ALL_TOOLS = $(BSD_TOOLS) $(OUR_TOOLS) ALL_TOOLS = $(BSD_TOOLS) $(OUR_TOOLS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -277,3 +273,13 @@ ALL_DEFAULT_INSTALLED_MODULES += $(SYMLINKS)
# local module name # local module name
ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \ ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \
$(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS) $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(SYMLINKS)
# We only want 'r' on userdebug and eng builds.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := r.c
LOCAL_CFLAGS += $(common_cflags)
LOCAL_MODULE := r
LOCAL_MODULE_TAGS := debug
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
include $(BUILD_EXECUTABLE)

2
toolbox/r.c
View file

@ -18,7 +18,7 @@ static int usage()
return -1; return -1;
} }
int r_main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
if(argc < 2) return usage(); if(argc < 2) return usage();