diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-11-21 12:38:48 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-03-14 11:14:08 +0000 |
| commit | 2f59c8a08f5a366c129017a4e6cab79e17196d11 (patch) | |
| tree | 7c867662ecf859699d1ab8cf4c0e7ddb8eacf7d9 | |
| parent | 26c472ffe32ecf484c9c42e8e61d926300b2be33 (diff) | |
| download | okhttp-2f59c8a08f5a366c129017a4e6cab79e17196d11.tar.gz | |
Use tools/currysrc/scripts/repackage-common.sh
The repackage-common.sh script provides support for using the
RepackagingTransform which reduces duplication in project specific
scripts and provides improved support for verifying the transformations
were applied correctly.
Tested by running the srcgen/generate_android_src.sh script and
verifying that it did not change the generated code.
Bug: 117818301
Test: see above
Change-Id: I03eed5f5fa56e542a2072c67a4407834fc236cd7
| -rwxr-xr-x | srcgen/generate_android_src.sh | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/srcgen/generate_android_src.sh b/srcgen/generate_android_src.sh index d46ca00..5f3a298 100755 --- a/srcgen/generate_android_src.sh +++ b/srcgen/generate_android_src.sh @@ -13,54 +13,34 @@ # See the License for the specific language governing permissions and # limitations under the License. -if [ -z "$ANDROID_BUILD_TOP" ]; then - echo "Missing environment variables. Did you run build/envsetup.sh and lunch?" 1>&2 +if [[ -z "${ANDROID_BUILD_TOP}" ]]; then + echo "Missing environment variables. Did you run build/envsetup.sh and lunch?" >&2 exit 1 fi -CLASSPATH=${ANDROID_HOST_OUT}/framework/currysrc.jar -PROJECT_DIR=${ANDROID_BUILD_TOP}/external/okhttp +PROJECT_DIR=external/okhttp -UNSUPPORTED_APP_USAGE_FILE=${PROJECT_DIR}/srcgen/unsupported-app-usage.json -DEFAULT_CONSTRUCTORS_FILE=${PROJECT_DIR}/srcgen/default-constructors.txt +PACKAGE_TRANSFORMATIONS="\ + com.squareup:com.android \ + okio:com.android.okhttp.okio \ +" -cd ${ANDROID_BUILD_TOP} -make -j15 currysrc +MODULE_DIRS="\ + android \ + okhttp \ + okhttp-urlconnection \ + okhttp-android-support \ + okio/okio \ +" -function do_transform() { - local SRC_IN_DIR=$1 - local SRC_OUT_DIR=$2 +SOURCE_DIRS="\ + src/main/java \ +" - if [ ! -d $SRC_OUT_DIR ]; then - echo ${SRC_OUT_DIR} does not exist >&2 - exit 1 - fi - rm -rf ${SRC_OUT_DIR} - mkdir -p ${SRC_OUT_DIR} - - java -cp ${CLASSPATH} com.google.currysrc.aosp.RepackagingTransform \ - --source-dir ${SRC_IN_DIR} \ - --target-dir ${SRC_OUT_DIR} \ - --package-transformation "com.squareup:com.android" \ - --package-transformation "okio:com.android.okhttp.okio" \ - --tab-size 2 \ - --unsupported-app-usage-file ${UNSUPPORTED_APP_USAGE_FILE} \ - --default-constructors ${DEFAULT_CONSTRUCTORS_FILE} \ - -} +TAB_SIZE=2 -REPACKAGED_DIR=${PROJECT_DIR}/repackaged -for i in android okhttp okhttp-urlconnection okhttp-android-support okio/okio -do - for s in src/main/java - do - IN=${PROJECT_DIR}/$i/$s - if [ -d $IN ]; then - OUT=${REPACKAGED_DIR}/$i/$s - do_transform ${IN} ${OUT} - fi - done -done +# Repackage the project's source. +source ${ANDROID_BUILD_TOP}/tools/currysrc/scripts/repackage-common.sh # Remove an unused source file: rm ${REPACKAGED_DIR}/okhttp/src/main/java/com/android/okhttp/internal/Platform.java |