Merge changes Id6f4b1a4,I2bec024d

#!/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

    echo "Usage: $0 INTERFACE_NAME"

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

git revert HEAD --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

#!/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