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

Commit dc4493cb authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge \\"Fix the generated getevent labels.\\" am: 80beb506 

am: 2f589bf9

Change-Id: Ia525ee4a6bca5ad2f83ebaddc4d73968474100fd
parents 763581ec 2f589bf9

toolbox/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ $(TOOLS_H): 




$(LOCAL_PATH)/getevent.c: $(intermediates)/input.h-labels.h

$(LOCAL_PATH)/getevent.c: $(intermediates)/input.h-labels.h





UAPI_INPUT_EVENT_CODES_H := bionic/libc/kernel/uapi/linux/input-event-codes.h

UAPI_INPUT_EVENT_CODES_H := bionic/libc/kernel/uapi/linux/input.h bionic/libc/kernel/uapi/linux/input-event-codes.h

INPUT_H_LABELS_H := $(intermediates)/input.h-labels.h

INPUT_H_LABELS_H := $(intermediates)/input.h-labels.h

$(INPUT_H_LABELS_H): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

$(INPUT_H_LABELS_H): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)

# The PRIVATE_CUSTOM_TOOL line uses = to evaluate the output path late.

# The PRIVATE_CUSTOM_TOOL line uses = to evaluate the output path late.

toolbox/generate-input.h-labels.py

+34 −33
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ ff_list = [] 




r = re.compile(r'#define\s+(\S+)\s+((?:0x)?\d+)')

r = re.compile(r'#define\s+(\S+)\s+((?:0x)?\d+)')





with open(sys.argv[1], 'r') as f:

for arg in sys.argv[1:]:

  with open(arg, 'r') as f:

    for line in f:

    for line in f:

      m = r.match(line)

      m = r.match(line)

      if m:

      if m: