Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e10d297e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '61b4b809':
  Build the optional 'r' tool separately.
parents 68e0d185 61b4b809

toolbox/Android.mk

+10 −4
Original line number Original line Diff line number Diff line
@@ -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)

toolbox/r.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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();