diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-03-14 05:06:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-14 05:06:13 -0700 |
| commit | d81905c105db9d8523e693826347cfa43d95bfd7 (patch) | |
| tree | 422957767f81c413d12ad51724a267bdc22a449e | |
| parent | a9b7a58bf113c6df8b02b314acd83b381671d62e (diff) | |
| parent | f198bc7bf35d5a91e0fc40683964d0f5ff3ce567 (diff) | |
| download | bouncycastle-d81905c105db9d8523e693826347cfa43d95bfd7.tar.gz | |
Merge "Use tools/currysrc/scripts/repackage-common.sh" am: 14f0dbd296
am: f198bc7bf3
Change-Id: I84a9b20a1b76b83d52791ea0fcf2a7dccf331aa3
| -rwxr-xr-x | srcgen/generate_android_src.sh | 47 |
1 files changed, 15 insertions, 32 deletions
diff --git a/srcgen/generate_android_src.sh b/srcgen/generate_android_src.sh index 5fcfd12f..6498bc79 100755 --- a/srcgen/generate_android_src.sh +++ b/srcgen/generate_android_src.sh @@ -13,46 +13,29 @@ # 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 -BOUNCY_CASTLE_DIR=${ANDROID_BUILD_TOP}/external/bouncycastle +PROJECT_DIR=external/bouncycastle -cd ${ANDROID_BUILD_TOP} -make -j15 currysrc +PACKAGE_TRANSFORMATIONS="\ + org.bouncycastle:com.android.org.bouncycastle \ +" -CORE_PLATFORM_API_FILE=${BOUNCY_CASTLE_DIR}/srcgen/core-platform-api.txt -UNSUPPORTED_APP_USAGE_FILE=${BOUNCY_CASTLE_DIR}/srcgen/unsupported-app-usage.json +MODULE_DIRS="\ + bcprov \ +" DEFAULT_CONSTRUCTORS_FILE=${BOUNCY_CASTLE_DIR}/srcgen/default-constructors.txt -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 "org.bouncycastle:com.android.org.bouncycastle" \ - --core-platform-api-file ${CORE_PLATFORM_API_FILE} \ - --unsupported-app-usage-file ${UNSUPPORTED_APP_USAGE_FILE} \ - --default-constructors ${DEFAULT_CONSTRUCTORS_FILE} \ - -} - -REPACKAGED_DIR=${BOUNCY_CASTLE_DIR}/repackaged -BCPROV_SRC_IN_DIR=${BOUNCY_CASTLE_DIR}/bcprov/src/main/java -BCPROV_SRC_OUT_DIR=${REPACKAGED_DIR}/bcprov/src/main/java -do_transform ${BCPROV_SRC_IN_DIR} ${BCPROV_SRC_OUT_DIR} +# Repackage the project's source. +source ${ANDROID_BUILD_TOP}/tools/currysrc/scripts/repackage-common.sh # Remove some unused source files: rm -fr ${REPACKAGED_DIR}/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ocsp/ + |