Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 947feefa70 am: 3ce8626d14android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release

am: c7b05ecd0a

Change-Id: I3048560398328abd549fa7b27ede5269a76c8276

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
+