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

Commit b04aba29 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes Id6f4b1a4,I2bec024d am: 9adf6fa9 am: 55577f4f am: 99faaaf5 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2449965



Change-Id: If63140bbb5d311a89a2d9bce531835bb9ceda07e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5ad94b9 99faaaf5

scripts/anapic_hidl2aidl_review.sh

+9 −1
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash

#

# Create two CLs for the given HIDL interface to see the diff between the

# hidl2aidl output and the source at the tip-of-tree.

# The first CL contains the hidl2aidl output after removing all existing AIDL

# files.

# The second CL contains all of the changes on top of the raw hidl2aidl output

# that can be used for review.





if [[ $# -ne 1 ]]; then

if [[ $# -ne 1 ]]; then

    echo "Usage: $0 INTERFACE_NAME"

    echo "Usage: $0 INTERFACE_NAME"
@@ -23,5 +30,6 @@ git add -A 
git commit -am "convert $1" --no-edit

git commit -am "convert $1" --no-edit

git revert HEAD --no-edit

git revert HEAD --no-edit

git commit --amend --no-edit

git commit --amend --no-edit

repo upload . --no-verify

git diff HEAD~1 --stat

repo upload . --no-verify --wip --hashtag=anapic_release_review

popd
 
popd

scripts/anapic_release_diff.sh

0 → 100755
+30 −0
Original line number Original line Diff line number Diff line 
#!/bin/bash

#

# Create a CL that contains the changes between this branch and a newer branch

# for a given AIDL interface.

# Be sure that BRANCH_BASE is the current upstream branch in order to get a CL.



if [[ $# -ne 3 ]]; then

    echo "Usage: $0 BRANCH_BASE BRANCH_NEW PACKAGE_NAME"

    echo "- BRANCH_BASE current branch, typically a previous release's dev branch"

    echo "- BRANCH_NEW end branch, typically goog/master as the latest branch"

    echo "- PACKAGE_NAME this is the AIDL package name"

    echo "example of creating the diffs for android.hardware.boot"

    echo "$ git checkout tm-dev ; repo start review"

    echo "$ ./anapic_release_diff.sh goog/tm-dev goog/master android.hardware.boot"

    exit 1

fi



# for pathmod

source ${ANDROID_BUILD_TOP}/build/make/envsetup.sh



set -ex



INTERFACE_NAME_NO_VER=${3%@*}

pushd $(pathmod $INTERFACE_NAME_NO_VER)

git diff "$1".."$2" android | git apply

git add -A

git commit -am "Android $1 to $2: $3" --no-edit

git diff HEAD~1 --stat

repo upload . --no-verify --wip --hashtag=anapic_release_review

popd