diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-04-07 18:56:21 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-04-15 21:11:47 +0530 |
| commit | 09b19b63f1e3f988a0cf433accae943b707390a0 (patch) | |
| tree | c338b1bc97f889b71f629ff9246de22680df43ae | |
| parent | ec08105594b675c4ae2a9e8b2025c3c778c169e6 (diff) | |
HACK: tailor the build for spreadtrum build
Change-Id: I89e09f240de843eb0320d936b82ed53d36155e45
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
| -rw-r--r-- | build-scripts/build-android | 6 | ||||
| -rw-r--r-- | build-scripts/helpers | 11 | ||||
| -rwxr-xr-x | build-scripts/post-build-lava.py | 3 |
3 files changed, 17 insertions, 3 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index b6ba5b7..fc97a7d 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -80,9 +80,9 @@ else fi if [ -n "$PATCHSETS" ]; then - for i in $PATCHSETS; do - sh ./android-patchsets/$i - done + cd spreadtrum-android-patchsets + sh ./patches_apply.sh $PWD/../ + cd - fi if [ -n "$POST_CHECKOUT_HOOK" ]; then # if echo "$POST_CHECKOUT_HOOK" | grep -F / >/dev/null; then diff --git a/build-scripts/helpers b/build-scripts/helpers index 2511051..001ea3c 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -51,6 +51,16 @@ repo-sync-from-mirror () { cd - fi + if [ -n "$LOCAL_MANIFEST2" ]; then + if [ ! -n "$LOCAL_MANIFEST_BRANCH2" ]; then + LOCAL_MANIFEST_BRANCH="master" + fi + cd .repo/local_manifests + git clone $LOCAL_MANIFEST2 -b $LOCAL_MANIFEST_BRANCH2 + cp spreadtrum-local-manifests/linaro.xml spreadtrum.xml + cd - + fi + if [ "$REWRITE_MANIFEST" != "0" ]; then echo Replace Linaro git URLs with lightweight http git URLs. ${BUILD_SCRIPT_ROOT}/rewrite-manifest.py .repo/manifest.xml -o processed-manifest.xml -u "${MANIFEST_REPO}" @@ -62,6 +72,7 @@ repo-sync-from-mirror () { # Restore source manifest temporarily to create pinned manifest cp out/source-manifest.xml .repo/manifest.xml repo manifest -r -o out/pinned-manifest.xml + rm -rf external/busybox } repo-sync-from-seed () { diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py index 6e34978..22dfcdb 100755 --- a/build-scripts/post-build-lava.py +++ b/build-scripts/post-build-lava.py @@ -67,6 +67,9 @@ PRODUCT_MAP = { "test_device_type": "aa9", "test_stream": "/private/team/fujitsu/ci-LT-Fujitsu-working-tree/" }, + "sp7731geabase_dt_native": { + "test_device_type": "tshark" + }, } OPTION_SUFFIX = "_OPTION" |