Snap for 5381581 from 085c5ca0523fb92ddbf690e4423b9b6e00d943c4 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi

Change-Id: Ief2d27bd6c36f7f0b3d9a6d7fc0bd35514ceb981

1 files changed, 18 insertions, 27 deletions

diff --git a/srcgen/generate_android_src.sh b/srcgen/generate_android_src.sh
index 2f569c09..a993ff38 100755
--- a/srcgen/generate_android_src.sh
+++ b/srcgen/generate_android_src.sh
@@ -18,44 +18,34 @@ if [[ -z "${ANDROID_BUILD_TOP}" ]]; then
     exit 1
 fi
 
-CLASSPATH=${ANDROID_HOST_OUT}/framework/currysrc.jar
-PROJECT_DIR=${ANDROID_BUILD_TOP}/external/libphonenumber
+PROJECT_DIR=external/libphonenumber
 
-cd ${ANDROID_BUILD_TOP}
-make -j15 currysrc
+PACKAGE_TRANSFORMATIONS="\
+    com.google:com.android \
+"
 
-UNSUPPORTED_APP_USAGE_FILE=${PROJECT_DIR}/srcgen/unsupported-app-usage.json
+MODULE_DIRS="\
+    libphonenumber \
+    geocoder \
+    internal/prefixmapper \
+"
 
-function do_transform() {
-  local SRC_IN_DIR=$1
-  local SRC_OUT_DIR=$2
+SOURCE_DIRS="\
+    src \
+"
 
-  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.google:com.android" \
-       --tab-size 2 \
-       --unsupported-app-usage-file ${UNSUPPORTED_APP_USAGE_FILE} \
+TAB_SIZE=2
 
-}
+# Repackage the project's source.
+source ${ANDROID_BUILD_TOP}/tools/currysrc/scripts/repackage-common.sh
 
-REPACKAGED_DIR=${PROJECT_DIR}/repackaged
-for i in libphonenumber geocoder internal/prefixmapper
+for i in ${MODULE_DIRS}
 do
-  for s in src
+  for s in ${SOURCE_DIRS}
   do
     IN=${PROJECT_DIR}/$i/$s
     if [ -d $IN ]; then
       OUT=${REPACKAGED_DIR}/$i/$s
-      do_transform ${IN} ${OUT}
-
       # Copy any resources
       echo Copying resources from ${IN} to ${OUT}
       RESOURCES=$(find ${IN} -type f | egrep -v '(\.java|\/package\.html)' || true)
@@ -70,3 +60,4 @@ do
     fi
   done
 done
+