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

Commit 444c535a authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am:... 

Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b8285335 am: 89aedd6c am: af77c134

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675867

Change-Id: I35b678f40dbc8643224aec26ba1808da893bb80f
parents e12ebbb9 af77c134

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPL 


strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}



hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

hidden_api_txt_checksorted_hook = ${REPO_ROOT}/tools/platform-compat/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}



hidden_api_txt_exclude_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/exclude.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

tools/hiddenapi/checksorted_sha.sh

deleted100755 → 0
+0 −10
Original line number Diff line number Diff line 
#!/bin/bash

set -e

LOCAL_DIR="$( dirname ${BASH_SOURCE} )"

git show --name-only --pretty=format: $1 | grep "hiddenapi/hiddenapi-.*txt" | while read file; do

    diff <(git show $1:$file) <(git show $1:$file | $LOCAL_DIR/sort_api.sh )  || {

      echo -e "\e[1m\e[31m$file $1 is not sorted or contains duplicates. To sort it correctly:\e[0m"

      echo -e "\e[33m${LOCAL_DIR}/sort_api.sh $PWD/$file\e[0m"

      exit 1

    }

done

tools/hiddenapi/sort_api.sh

deleted100755 → 0
+0 −26
Original line number Diff line number Diff line 
#!/bin/bash

set -e

if [ -z "$1" ]; then

  source_list=/dev/stdin

  dest_list=/dev/stdout

else

  source_list="$1"

  dest_list="$1"

fi

# Load the file

readarray A < "$source_list"

# Sort

IFS=$'\n'

# Stash away comments

C=( $(grep -E '^#' <<< "${A[*]}" || :) )

A=( $(grep -v -E '^#' <<< "${A[*]}" || :) )

# Sort entries

A=( $(LC_COLLATE=C sort -f <<< "${A[*]}") )

A=( $(uniq <<< "${A[*]}") )

# Concatenate comments and entries

A=( ${C[*]} ${A[*]} )

unset IFS

# Dump array back into the file

if [ ${#A[@]} -ne 0 ]; then

  printf '%s\n' "${A[@]}" > "$dest_list"

fi