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

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

Merge \"Fix the generated getevent labels.\"

am: 80beb506

Change-Id: I1e289081553afc516c96584822e36c3475675e98
parents 69e6dde7 80beb506
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ $(TOOLS_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): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)
# The PRIVATE_CUSTOM_TOOL line uses = to evaluate the output path late.
+34 −33
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ ff_list = []

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:
      m = r.match(line)
      if m: